Merge branch 'master' into 236-support-saml-and-oauth2-logins-as-consumer

aleksis/core/apps.py

aleksis/core/filters.py

aleksis/core/forms.py

aleksis/core/managers.py

aleksis/core/menus.py

aleksis/core/migrations/0002_school_term.py

aleksis/core/migrations/0003_drop_image_cropping.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/print.css

aleksis/core/static/style.scss

aleksis/core/tables.py

aleksis/core/templates/403.html

aleksis/core/templates/404.html

aleksis/core/templates/500.html

aleksis/core/templates/503.html