shiny new ui
Merge commit '317ecc77eeb96cd6ca41adafdf5cfba167572329' into ui_overhaul

Conflicts:
	app/client/css/main.css
	app/client/js/controllers/main-controller.js
	app/client/views/index.html
	app/client/views/main.html
Merge branch 'ui_overhaul' of https://github.com/nfeliciano/mangiamo into ui_overhaul