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

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of
https://github.com/lotterywj/lottery_project.git

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/idemo/lottery/R$drawable.class
	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
	gen/com/idemo/lottery/R.java
	lint.xml
	res/layout/il_bottom.xml