....
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shoppu/src/com/me/game/GameScreen.java
Merge branch 'master' of https://github.com/jesusguillermo/kong