+layers
Merge branch 'master' of https://github.com/whwang5566/ParadeOnline

Conflicts:
	client/js/game.js