Refactored GameScreen, MapView and etc. Support of scoreView and MapView in GameScreen
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk

Conflicts:
	Test Game/test-game/src/com/testgame/MyGame.java
	Test Game/test-game/src/com/testgame/Views/GameScreen.java
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk