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

CHANGELOG.rst

aleksis/core/forms.py

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

aleksis/core/menus.py

aleksis/core/migrations/0019_fix_uniqueness_per_site.py

aleksis/core/models.py

aleksis/core/preferences.py

aleksis/core/rules.py

aleksis/core/settings.py

aleksis/core/templates/account/account_inactive.html

aleksis/core/templates/account/email/base_message.txt

aleksis/core/templates/account/email_confirm.html

aleksis/core/templates/account/password_change.html

aleksis/core/templates/account/password_change_disabled.html

aleksis/core/templates/account/password_reset.html

aleksis/core/templates/account/password_reset_done.html

aleksis/core/templates/account/password_reset_from_key.html

.../core/templates/account/password_reset_from_key_done.html

aleksis/core/templates/account/password_set.html

aleksis/core/templates/account/signup.html