Fixes #164
Merge branch 'Honest' of https://github.com/ucam-cl-dtg/isaac-app into Honest

Conflicts:
	app/js/app/controllers/AccountSettingsPageControllers.js