update signscan issues
Merge branch 'master' of github.com:kit-team/xuebao

Conflicts:
	res/values/strings.xml
	src/cn/net/yto/ui/SignScanActivity.java