Merge branch 'master' into 158-documentation-needed-for-first-release

.gitlab-ci.yml

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/models.py

aleksis/core/preferences.py

aleksis/core/settings.py

aleksis/core/tasks.py

aleksis/core/templates/core/person/full.html

aleksis/core/templatetags/html_helpers.py

aleksis/core/util/core_helpers.py