Merge branch 'axeman_docker' into iceslam

# Conflicts:
#	backend/.gitignore
#	backend/src/config/asgi.py
#	backend/src/config/settings.py
#	backend/src/config/urls.py
#	backend/src/config/wsgi.py
#	backend/src/manage.py
#	backend/src/num8erz/apps.py
#	backend/src/num8erz/cluster_scenarios/detail/analyse/service.py
#	backend/src/scripts/cl_scenarios/iteration/first_iteration.py
#	backend/src/static/admin/css/autocomplete.css
#	backend/src/static/admin/css/base.css
#	backend/src/static/admin/css/changelists.css
#	backend/src/static/admin/css/dashboard.css
#	backend/src/static/admin/css/fonts.css
#	backend/src/static/admin/css/forms.css
#	backend/src/static/admin/css/login.css
#	backend/src/static/admin/css/nav_sidebar.css
#	backend/src/static/admin/css/responsive.css
#	backend/src/static/admin/css/responsive_rtl.css
#	backend/src/static/admin/css/rtl.css
#	backend/src/static/admin/css/vendor/select2/LICENSE-SELECT2.md
#	backend/src/static/admin/css/vendor/select2/select2.css
#	backend/src/static/admin/css/vendor/select2/select2.min.css
#	backend/src/static/admin/css/widgets.css
#	backend/src/static/admin/fonts/LICENSE.txt
#	backend/src/static/admin/fonts/README.txt
#	backend/src/static/admin/fonts/Roboto-Bold-webfont.woff
#	backend/src/static/admin/fonts/Roboto-Light-webfont.woff
#	backend/src/static/admin/fonts/Roboto-Regular-webfont.woff
#	backend/src/static/admin/img/LICENSE
#	backend/src/static/admin/img/README.txt
#	backend/src/static/admin/img/calendar-icons.svg
#	backend/src/static/admin/img/gis/move_vertex_off.svg
#	backend/src/static/admin/img/gis/move_vertex_on.svg
#	backend/src/static/admin/img/icon-addlink.svg
#	backend/src/static/admin/img/icon-alert.svg
#	backend/src/static/admin/img/icon-calendar.svg
#	backend/src/static/admin/img/icon-changelink.svg
#	backend/src/static/admin/img/icon-clock.svg
#	backend/src/static/admin/img/icon-deletelink.svg
#	backend/src/static/admin/img/icon-no.svg
#	backend/src/static/admin/img/icon-unknown-alt.svg
#	backend/src/static/admin/img/icon-unknown.svg
#	backend/src/static/admin/img/icon-viewlink.svg
#	backend/src/static/admin/img/icon-yes.svg
#	backend/src/static/admin/img/inline-delete.svg
#	backend/src/static/admin/img/search.svg
#	backend/src/static/admin/img/selector-icons.svg
#	backend/src/static/admin/img/sorting-icons.svg
#	backend/src/static/admin/img/tooltag-add.svg
#	backend/src/static/admin/img/tooltag-arrowright.svg
#	backend/src/static/admin/js/SelectBox.js
#	backend/src/static/admin/js/SelectFilter2.js
#	backend/src/static/admin/js/actions.js
#	backend/src/static/admin/js/admin/DateTimeShortcuts.js
#	backend/src/static/admin/js/admin/RelatedObjectLookups.js
#	backend/src/static/admin/js/autocomplete.js
#	backend/src/static/admin/js/calendar.js
#	backend/src/static/admin/js/cancel.js
#	backend/src/static/admin/js/change_form.js
#	backend/src/static/admin/js/collapse.js
#	backend/src/static/admin/js/core.js
#	backend/src/static/admin/js/inlines.js
#	backend/src/static/admin/js/jquery.init.js
#	backend/src/static/admin/js/nav_sidebar.js
#	backend/src/static/admin/js/popup_response.js
#	backend/src/static/admin/js/prepopulate.js
#	backend/src/static/admin/js/prepopulate_init.js
#	backend/src/static/admin/js/urlify.js
#	backend/src/static/admin/js/vendor/jquery/LICENSE.txt
#	backend/src/static/admin/js/vendor/jquery/jquery.js
#	backend/src/static/admin/js/vendor/jquery/jquery.min.js
#	backend/src/static/admin/js/vendor/select2/LICENSE.md
#	backend/src/static/admin/js/vendor/select2/i18n/af.js
#	backend/src/static/admin/js/vendor/select2/i18n/ar.js
#	backend/src/static/admin/js/vendor/select2/i18n/az.js
#	backend/src/static/admin/js/vendor/select2/i18n/bg.js
#	backend/src/static/admin/js/vendor/select2/i18n/bn.js
#	backend/src/static/admin/js/vendor/select2/i18n/bs.js
#	backend/src/static/admin/js/vendor/select2/i18n/ca.js
#	backend/src/static/admin/js/vendor/select2/i18n/cs.js
#	backend/src/static/admin/js/vendor/select2/i18n/da.js
#	backend/src/static/admin/js/vendor/select2/i18n/de.js
#	backend/src/static/admin/js/vendor/select2/i18n/dsb.js
#	backend/src/static/admin/js/vendor/select2/i18n/el.js
#	backend/src/static/admin/js/vendor/select2/i18n/en.js
#	backend/src/static/admin/js/vendor/select2/i18n/es.js
#	backend/src/static/admin/js/vendor/select2/i18n/et.js
#	backend/src/static/admin/js/vendor/select2/i18n/eu.js
#	backend/src/static/admin/js/vendor/select2/i18n/fa.js
#	backend/src/static/admin/js/vendor/select2/i18n/fi.js
#	backend/src/static/admin/js/vendor/select2/i18n/fr.js
#	backend/src/static/admin/js/vendor/select2/i18n/gl.js
#	backend/src/static/admin/js/vendor/select2/i18n/he.js
#	backend/src/static/admin/js/vendor/select2/i18n/hi.js
#	backend/src/static/admin/js/vendor/select2/i18n/hr.js
#	backend/src/static/admin/js/vendor/select2/i18n/hsb.js
#	backend/src/static/admin/js/vendor/select2/i18n/hu.js
#	backend/src/static/admin/js/vendor/select2/i18n/hy.js
#	backend/src/static/admin/js/vendor/select2/i18n/id.js
#	backend/src/static/admin/js/vendor/select2/i18n/is.js
#	backend/src/static/admin/js/vendor/select2/i18n/it.js
#	backend/src/static/admin/js/vendor/select2/i18n/ja.js
#	backend/src/static/admin/js/vendor/select2/i18n/ka.js
#	backend/src/static/admin/js/vendor/select2/i18n/km.js
#	backend/src/static/admin/js/vendor/select2/i18n/ko.js
#	backend/src/static/admin/js/vendor/select2/i18n/lt.js
#	backend/src/static/admin/js/vendor/select2/i18n/lv.js
#	backend/src/static/admin/js/vendor/select2/i18n/mk.js
#	backend/src/static/admin/js/vendor/select2/i18n/ms.js
#	backend/src/static/admin/js/vendor/select2/i18n/nb.js
#	backend/src/static/admin/js/vendor/select2/i18n/ne.js
#	backend/src/static/admin/js/vendor/select2/i18n/nl.js
#	backend/src/static/admin/js/vendor/select2/i18n/pl.js
#	backend/src/static/admin/js/vendor/select2/i18n/ps.js
#	backend/src/static/admin/js/vendor/select2/i18n/pt-BR.js
#	backend/src/static/admin/js/vendor/select2/i18n/pt.js
#	backend/src/static/admin/js/vendor/select2/i18n/ro.js
#	backend/src/static/admin/js/vendor/select2/i18n/ru.js
#	backend/src/static/admin/js/vendor/select2/i18n/sk.js
#	backend/src/static/admin/js/vendor/select2/i18n/sl.js
#	backend/src/static/admin/js/vendor/select2/i18n/sq.js
#	backend/src/static/admin/js/vendor/select2/i18n/sr-Cyrl.js
#	backend/src/static/admin/js/vendor/select2/i18n/sr.js
#	backend/src/static/admin/js/vendor/select2/i18n/sv.js
#	backend/src/static/admin/js/vendor/select2/i18n/th.js
#	backend/src/static/admin/js/vendor/select2/i18n/tk.js
#	backend/src/static/admin/js/vendor/select2/i18n/tr.js
#	backend/src/static/admin/js/vendor/select2/i18n/uk.js
#	backend/src/static/admin/js/vendor/select2/i18n/vi.js
#	backend/src/static/admin/js/vendor/select2/i18n/zh-CN.js
#	backend/src/static/admin/js/vendor/select2/i18n/zh-TW.js
#	backend/src/static/admin/js/vendor/select2/select2.full.js
#	backend/src/static/admin/js/vendor/select2/select2.full.min.js
#	backend/src/static/admin/js/vendor/xregexp/LICENSE.txt
#	backend/src/static/admin/js/vendor/xregexp/xregexp.js
#	backend/src/static/admin/js/vendor/xregexp/xregexp.min.js
#	backend/src/static/rest_framework/css/bootstrap-theme.min.css
#	backend/src/static/rest_framework/css/bootstrap-tweaks.css
#	backend/src/static/rest_framework/css/bootstrap.min.css
#	backend/src/static/rest_framework/css/default.css
#	backend/src/static/rest_framework/css/font-awesome-4.0.3.css
#	backend/src/static/rest_framework/css/prettify.css
#	backend/src/static/rest_framework/docs/css/base.css
#	backend/src/static/rest_framework/docs/css/highlight.css
#	backend/src/static/rest_framework/docs/css/jquery.json-view.min.css
#	backend/src/static/rest_framework/docs/img/favicon.ico
#	backend/src/static/rest_framework/docs/img/grid.png
#	backend/src/static/rest_framework/docs/js/api.js
#	backend/src/static/rest_framework/docs/js/highlight.pack.js
#	backend/src/static/rest_framework/docs/js/jquery.json-view.min.js
#	backend/src/static/rest_framework/fonts/fontawesome-webfont.eot
#	backend/src/static/rest_framework/fonts/fontawesome-webfont.svg
#	backend/src/static/rest_framework/fonts/fontawesome-webfont.ttf
#	backend/src/static/rest_framework/fonts/fontawesome-webfont.woff
#	backend/src/static/rest_framework/fonts/glyphicons-halflings-regular.eot
#	backend/src/static/rest_framework/fonts/glyphicons-halflings-regular.svg
#	backend/src/static/rest_framework/fonts/glyphicons-halflings-regular.ttf
#	backend/src/static/rest_framework/fonts/glyphicons-halflings-regular.woff
#	backend/src/static/rest_framework/fonts/glyphicons-halflings-regular.woff2
#	backend/src/static/rest_framework/img/glyphicons-halflings-white.png
#	backend/src/static/rest_framework/img/glyphicons-halflings.png
#	backend/src/static/rest_framework/img/grid.png
#	backend/src/static/rest_framework/js/ajax-form.js
#	backend/src/static/rest_framework/js/bootstrap.min.js
#	backend/src/static/rest_framework/js/coreapi-0.1.1.js
#	backend/src/static/rest_framework/js/csrf.js
#	backend/src/static/rest_framework/js/default.js
#	backend/src/static/rest_framework/js/jquery-3.5.1.min.js
#	backend/src/static/rest_framework/js/prettify-min.js