minye's commit
Merge branch 'master' of https://github.com/hongkunyoo/gonexon
Merge branch 'master' of https://github.com/hongkunyoo/gonexon
minye's commit
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/entities/player.js