Updated
Merge branch 'dev1' of https://github.com/lemuelski/UntitledProj into dev1

Conflicts:
	android/assets/gamescreen.pack
	android/assets/gamescreen.png
	core/src/com/mygdx/custom/TargetGrid.java
	core/src/com/mygdx/screen/PreBattleScreen.java