trying to implement things to make the UI better
Merge branch 'master' of https://github.com/UKCHackMizzou2014/Global-Hack-III-Project

Conflicts:
	app/src/main/web/js/util/ui_interaction.js