update
Merge branch 'develop'
Merge branch 'master' into github
Merge branches 'master' and 'master' of github.com:wecenter/wecenter into github