测试1
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git

Conflicts:
	res/values-zh-rCN/strings.xml
Merge branch 'master' of https://github.com/superleo-cn/pos-android