bugfix
Merge branch 'develop' of https://bitbucket.org/wecenter/wecenter into develop
Merge branch 'develop'
Merge branch 'master' into github