fix compile error
Merge branch 'master' of https://github.com/danielsuter/tank-wars

Conflicts:
	src/main/webapp/js/Game.js
Merge branch 'master' of https://github.com/danielsuter/tank-wars