image linking/uploading, video embedding, question page condensed and a few other things
Merge branch 'master' of https://github.com/verily-org/verily

Conflicts:
	controllers/crises.js
	lib/roles.js
	static/js/load.js
	views/crisis/one.html
	views/macros/_answers.html
	views/question/one.html