Merge branch 'master' into 331-user-registration

aleksis/core/__init__.py

aleksis/core/__main__.py

aleksis/core/apps.py

aleksis/core/checks.py

aleksis/core/data_checks.py

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

aleksis/core/migrations/0001_initial.py

aleksis/core/mixins.py

aleksis/core/models.py

aleksis/core/settings.py

aleksis/core/static/icons/favicon_16.png

aleksis/core/static/icons/favicon_32.png

aleksis/core/static/icons/favicon_48.png

aleksis/core/static/img/aleksis-icon.svg

aleksis/core/tasks.py

aleksis/core/urls.py

aleksis/core/util/apps.py

aleksis/core/util/celery_progress.py

aleksis/core/util/core_helpers.py

aleksis/core/util/search.py