new styling with bootstrap and awesome css
Merge branch 'master' of https://github.com/rolger/sportmanager-javascript

Conflicts:
	app/js/controllers.js