gengxin
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git
更新
Merge branch 'master' of https://github.com/superleo-cn/pos-android.git

Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/strings.xml