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

Conflicts:
	AndroidManifest.xml