...
Merge branch 'master' of https://github.com/jesusguillermo/kong

Conflicts:
	Shoppu/src/com/me/game/WorldGame.java