Merge branch 'dev' into feature/events

.gitignore

requirements.txt

schoolapps/faq/admin.py

schoolapps/faq/apps.py

schoolapps/faq/forms.py

schoolapps/faq/migrations/0002_auto_20190722_1336.py

schoolapps/faq/migrations/0003_auto_20190722_1415.py

schoolapps/faq/model_helper.py

schoolapps/faq/models.py

schoolapps/faq/parseIconNames.py

schoolapps/faq/templates/faq/ask.html

schoolapps/faq/templates/faq/faq.html

schoolapps/faq/templates/faq/question_submitted.html

schoolapps/faq/views.py

schoolapps/static/common/style.css