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

Conflicts:
	Halloon/res/layout/tab_mainpage.xml