Merge branch 'master' into 181-additional-fields-for-people-per-group

aleksis/core/admin.py

aleksis/core/apps.py

aleksis/core/forms.py

aleksis/core/menus.py

aleksis/core/migrations/0025_dynamic_preferences.py

aleksis/core/mixins.py

aleksis/core/models.py

aleksis/core/preferences.py

aleksis/core/registries.py

aleksis/core/rules.py

aleksis/core/settings.py

aleksis/core/static/js/main.js

aleksis/core/static/theme.scss

aleksis/core/templates/core/base.html

aleksis/core/templates/core/edit_school.html

aleksis/core/templates/core/edit_schoolterm.html

aleksis/core/templates/core/group_full.html

aleksis/core/templates/core/meta.html

aleksis/core/templates/core/no_person.html

aleksis/core/templates/core/person_full.html