更新个人设置页面
Merge branch 'master' of https://github.com/wjling/Catherine.git

Conflicts:
	Catherine-master/res/values/strings.xml