_
Conflicts:
	samples/game/client/game.js
	samples/game/client/index.html