[4] Merge development into master

**Trello**: https://trello.com/c/m6zdiZOa/4-merge-development-into-master

---

This pull request represents the divergence between development, which is on staging, and the master branch which represents production.

It includes commits from WMGG's fork of Honolulu Answers and some other stuff which is / was pending review before being pushed to master.