string
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/src/main/AndroidManifest.xml
用户信息，消息通知
Merge remote-tracking branch 'origin/develop' into develop