day
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/LuckyDrawPage$1$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/LuckyDrawPage$1$2.class
	FantasyShooter/bin/classes/com/fshoot/framepage/LuckyDrawPage$1$3.class
	FantasyShooter/bin/classes/com/fshoot/framepage/LuckyDrawPage$1.class
	FantasyShooter/bin/classes/com/fshoot/framepage/LuckyDrawPage$2.class
	FantasyShooter/bin/classes/com/fshoot/framepage/LuckyDrawPage.class
	FantasyShooter/bin/resources.ap_
	FantasyShooter/src/com/fshoot/framepage/LuckyDrawPage.java