sorry
Merge branch 'master' of https://github.com/hongkunyoo/gonexon

Conflicts:
	lib/game/main.js
	lib/game/managers/gameManager.js
	lib/game/managers/itemManager.js
edit item Manager, item