test
Merge branch 'master' of
https://github.com/FantasyShooter/Fantasy-Shooter.git

Conflicts:
	FantasyShooter/bin/FantasyShooter.apk
	FantasyShooter/bin/classes.dex
	FantasyShooter/bin/classes/com/fshoot/framepage/BattlePage$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/BattlePage$2.class
	FantasyShooter/bin/classes/com/fshoot/framepage/BattlePage$3.class
	FantasyShooter/bin/classes/com/fshoot/framepage/BattlePage.class
	FantasyShooter/bin/resources.ap_
Merge branch 'master' of
https://github.com/FantasyShooter/Fantasy-Shooter.git

Conflicts:
	FantasyShooter/bin/FantasyShooter.apk
	FantasyShooter/bin/classes.dex
	FantasyShooter/bin/classes/com/fshoot/framepage/StartPage.class
	FantasyShooter/bin/classes/com/fshoot/framepage/TownPage.class
	FantasyShooter/bin/resources.ap_