解决冲突
Merge branch 'master' of https://github.com/huangsanm/UISample

Conflicts:
	app/src/main/res/values/strings.xml