STH
Merge branch 'master' of github.com:suntinghui/LYY4Android_SCAN

Conflicts:
	res/values/strings.xml
STH