ll
Merge branch 'master' of
https://github.com/lotterywj/lottery_project.git

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/com/idemo/lottery/R$id.class
	bin/classes/com/idemo/lottery/R$layout.class
	bin/classes/com/idemo/lottery/R$menu.class
	bin/classes/com/idemo/lottery/R$string.class
	bin/classes/com/idemo/lottery/R$style.class
	bin/classes/com/idemo/lottery/view/manager/TopManager.class
	bin/lottery.apk
	bin/resources.ap_
	gen/com/idemo/lottery/R.java