Merge branch 'master' of edugit.org:AlekSIS/official/AlekSIS

.gitlab-ci.yml

.gitmodules

aleksis/core/admin.py

aleksis/core/apps.py

aleksis/core/locale/ar/LC_MESSAGES/django.po

aleksis/core/locale/ar/LC_MESSAGES/djangojs.po

aleksis/core/locale/de_DE/LC_MESSAGES/django.po

aleksis/core/locale/de_DE/LC_MESSAGES/djangojs.po

aleksis/core/locale/fr/LC_MESSAGES/django.po

aleksis/core/locale/fr/LC_MESSAGES/djangojs.po

aleksis/core/locale/la/LC_MESSAGES/django.po

aleksis/core/locale/la/LC_MESSAGES/djangojs.po

aleksis/core/locale/nb_NO/LC_MESSAGES/django.po

aleksis/core/locale/nb_NO/LC_MESSAGES/djangojs.po

aleksis/core/locale/tr_TR/LC_MESSAGES/django.po

aleksis/core/locale/tr_TR/LC_MESSAGES/djangojs.po

aleksis/core/menus.py

aleksis/core/migrations/0015_add_import_ref_to_group.py

aleksis/core/migrations/0016_custom_menus.py

...is/core/migrations/0017_make_group_short_name_optional.py