answer submission user experience
Merge branch 'master' of https://github.com/madthad91/tSolutions

Conflicts:
	www/js/controllers.js