Merge remote-tracking branch 'remotes/origin/设置界面'

Conflicts:
	app/app.iml
	app/src/main/res/values/strings.xml
	realm_version_check.timestamp