Code polish
Merge branch 'merginben' of github.com:nodeGame/nodegame-client into merginben

Conflicts:
	build/nodegame-full.js