small changes
Merge branch 'master' of https://github.com/TeamBlaze/Hunting

Conflicts:
	src/main/webapp/resources/scripts/game.js