Self-destruct imminent

"I highly suggest you don't do what you are about to do"
-Omeed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tests/spec.js

	meanjs_admissions/meanjs-mean-2c319c5/public/modules/applications/views/edit-application.client.view.html