Merge branch 'master' of https://github.com/wgzhxy/weixin
提交微信分组管理接口
Merge branch 'master-new' into master-test
增加https的请求工具类
Merge branch 'master' into master-new
疯狂彩图demo
更新的demo
Merge branch 'master' of https://github.com/wgzhxy/weixin
微页面，位置在shaokui/前端/pages.html，另外刨了个坑，没有用Bootstrap的弹出框来实现自定义菜单，抄了个现成的。
Merge branch 'master' of https://github.com/wgzhxy/weixin

Conflicts:
	weixinPlatform/shaokui/后台demo.graffle/data.plist
合并时候不小心删除了wap.css，补上
no message
Merge branch 'master' of https://github.com/wgzhxy/weixin
添加静态页面
微页面分类管理提交!
Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge branch 'master' of https://github.com/wgzhxy/weixin
Merge branch 'master' of https://github.com/wgzhxy/weixin