some bug and some ui change
crash
crash
Merge branch 'chat4football'

Conflicts:
	AndroidManifest.xml