修改图标，左侧菜单项
Merge branch 'master' of https://github.com/baijianguo/kanmeizi.git

Conflicts:
	AndroidManifest.xml