CNLive Android Team / CNIMDemo · Commits

# Conflicts:
#	.idea/misc.xml
#	.idea/modules.xml
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/cnlive/im/CNLiveApplication.java