Displaying History in a new sidebar
Merge branch 'master' of github.com:ADP-Hackathons/PlanningPoker

Conflicts:
	public/modules/games/views/game.html