Merge branch 'dev' into feature/substitutions

.gitignore

.gitmodules

.idea/dataSources.local.xml

.idea/misc.xml

.idea/school-apps.iml

README.md

schoolapps/LDAP-groups-et-al.patch

schoolapps/aub/decorators.py

schoolapps/aub/filters.py

schoolapps/aub/forms.py

schoolapps/aub/migrations/0001_initial.py

schoolapps/aub/migrations/0002_aub_status.py

schoolapps/aub/migrations/0003_auto_20181031_1551.py

schoolapps/aub/migrations/__init__.py

schoolapps/aub/models.py

schoolapps/aub/templates/aub/apply_for.html

schoolapps/aub/templates/aub/check.html

schoolapps/aub/templates/aub/index.html

schoolapps/aub/urls.py

schoolapps/aub/views.py