修改文字内容
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollectionScanner/res/layout/home.xml
	CollectionScanner/res/values/strings.xml