Initial commit
v2
v2
Merge remote-tracking branch 'tp/v2'

Conflicts:
	.gitignore
	Gruntfile.js
	package.json
	public/index.html
	public/js/lib/jquery.js
	public/js/tmpl/game.js
	public/js/tmpl/main.js
	public/js/tmpl/scoreboard.js
	templates/game.xml
	templates/main.xml
	templates/scoreboard.xml