删除无用的activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/easemob/chatuidemo/adapter/MessageAdapter.java