Started ui
Merge branch 'master' of https://github.com/SmuliS/ball-in-hand

Conflicts:
	app/assets/javascripts/app/templates/main.hamstache
	app/assets/javascripts/application.js
cleanup