fix 图标消失的bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	faw-vw/AndroidManifest.xml