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