commit
Merge branch 'master' of https://github.com/xxxzhi/halloon-project-android.git

Conflicts:
	Halloon/AndroidManifest.xml