sync 1.2.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/io/rong/imkit/demo/DemoContext.java
	app/src/main/java/io/rong/imkit/demo/LoginActivity.java
	app/src/main/java/io/rong/imkit/demo/MainActivity.java
	app/src/main/java/io/rong/imkit/demo/RegisterActivity.java
	app/src/main/res/values/strings.xml