增加扫一扫功能
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	AndroidManifest.xml
	res/values/dimens.xml