Merge branch 'master' into 242-create-delete-person-and-group

aleksis/core/forms.py

aleksis/core/managers.py

aleksis/core/menus.py

aleksis/core/migrations/0002_school_term.py

aleksis/core/mixins.py

aleksis/core/models.py

aleksis/core/rules.py

aleksis/core/settings.py

aleksis/core/static/js/main.js

aleksis/core/static/js/progress.js

aleksis/core/static/style.scss

aleksis/core/tables.py

aleksis/core/templates/core/base.html

aleksis/core/templates/core/pages/progress.html

aleksis/core/templates/core/partials/language_form.html

aleksis/core/templates/core/person/collection.html

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

aleksis/core/templates/core/school_term/create.html

aleksis/core/templates/core/school_term/edit.html

aleksis/core/templates/core/school_term/list.html