Work on MegaPlayer.
Merge branch 'develop' of https://github.com/Emeltee/iSMG.git into
develop

Conflicts:
	my-gdx-game/src/com/me/mygdxgame/MyGdxGame.java