fixed merge conflicts for the real
Merge branch 'master' of github.com:ddsc/webclient