Merge remote-tracking branch 'origin/master'

# 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

~$IMSDK文档_Android.doc

+++ "b/~$IMSDK\346\226\207\346\241\243_Android.doc"