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

Conflicts:
	Halloon/res/layout/tweet_content.xml
	Halloon/res/values/styles.xml