hellllllllllllla stuff
Merge branch 'master' of https://github.com/scott113341/appicenter

Conflicts:
	app/build/templates/scoreboard-controller.html
recompile