疯狂猜图换了个图给甲方看，鈜宇的web里面加个目录方便手机查看
Merge branch 'master' of https://github.com/wgzhxy/weixin

Conflicts:
	weixinPlatform/shaokui/test.html