Changed home screen
Fixed various things
Merge branch 'master' of github.com:dst-hackathon/bintoui

Conflicts:
	app/js/controllers.js