Merge branch 'master' into 269-photo-cropping-broken

.gitlab-ci.yml

aleksis/core/apps.py

aleksis/core/filters.py

aleksis/core/forms.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/managers.py

aleksis/core/mixins.py

aleksis/core/models.py

aleksis/core/preferences.py