modify 2.0.9
Merge branch 'easemob-dev'

Conflicts:
	ChatDemoUI/AndroidManifest.xml
Merge branch 'easemob-dev'
merge to master
update chatactivity
Merge branch 'easemob-dev'
update loginactivity
update demoapplication
Merge branch 'easemob-dev'
update demeapplication
temp commit
Merge branch 'master' into easemob-dev
update for roster