Small Changes
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul

Conflicts:
	app/client/js/controllers/main-controller.js