AI-2.3 <Administrator@SL-20160223UCWE Merge branch 'master'
AI-2.3 <Administrator@SL-20160223UCWE Merge branch 'master'

Conflicts:
	.idea/gradle.xml
	.idea/vcs.xml
	README.md
	app/src/main/AndroidManifest.xml
	app/src/main/java/chen/testchat/adapter/ImagePageAdapter.java
	app/src/main/java/chen/testchat/base/CommonImageLoader.java
	app/src/main/java/chen/testchat/db/ChatDB.java
	app/src/main/java/chen/testchat/manager/MsgManager.java
	app/src/main/java/chen/testchat/receiver/PushMessageReceiver.java
	app/src/main/java/chen/testchat/service/GroupMessageService.java
	app/src/main/java/chen/testchat/ui/ChatActivity.java
	app/src/main/java/chen/testchat/ui/EditUserInfoActivity.java
	app/src/main/java/chen/testchat/ui/MainActivity.java
	app/src/main/java/chen/testchat/ui/UserInfoActivity.java
	common/build.gradle
	common/src/main/debug/AndroidManifest.xml

HelloChenJinJun/TestChat