Merge branch 'master' into 524-add-birthplace-to-core-data

CHANGELOG.rst

aleksis/core/forms.py

aleksis/core/menus.py

aleksis/core/migrations/0023_oauth_application_model.py

aleksis/core/migrations/0024_oauth_grant_types_optional.py

aleksis/core/migrations/0025_oauth_align_user_fk.py

aleksis/core/models.py

aleksis/core/preferences.py

aleksis/core/rules.py

aleksis/core/settings.py

aleksis/core/templates/core/base.html

...is/core/templates/oauth2_provider/application/create.html

...is/core/templates/oauth2_provider/application/detail.html

aleksis/core/templates/oauth2_provider/application/edit.html

aleksis/core/templates/oauth2_provider/application/list.html

...templates/oauth2_provider/application_confirm_delete.html

...is/core/templates/oauth2_provider/application_detail.html

aleksis/core/templates/oauth2_provider/authorize.html

...re/templates/oauth2_provider/authorized-token-delete.html

aleksis/core/urls.py