bug fix
Merge branch 'develop' of bitbucket.org:wecenter/wecenter into develop
language
Merge branch 'develop'
Merge branch 'master' into github