Merge pull request #2 from iheron/develop

Develop
Merge branch 'develop'
Merge branch 'master' of /Users/heron/WebstormProjects/heron.wechat with conflicts.
init
init
init
init