ui cleanup.
Merge branch 'master' into ui-cleanup

Conflicts:
	static/templates.js
	templates/Nasa.hbs
	templates/Start.hbs
	templates/Survey.hbs