Update buttons and stuff
Merge branch 'master' of https://github.com/ADP-Hackathons/PlanningPoker

Conflicts:
	public/modules/games/controllers/game.js
	public/modules/games/views/game.html
Merge branch 'master' of https://github.com/ADP-Hackathons/PlanningPoker