# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/offcn/im/demo/ui/SplashActivity.java
#	app/src/main/java/com/offcn/imclient/ui/ContactListFragment.java
#	app/src/main/java/com/offcn/imclient/ui/LoginActivity.java
#	app/src/main/res/values/strings.xml