Merge branch 'master' of https://github.com/baijianguo/kanmeizi.git

Conflicts:
	AndroidManifest.xml
wsww