adapter
Merge branch 'master' of https://github.com/peng571/MakeAGame.git

Conflicts:
	core/src/com/makeagame/magerevenge/GameView.java