Merge pull request #148 from zmathe/dev_web_main

bug fixes
Merge pull request #149 from zmathe/dev_web_main

compile extensions
Merge remote-tracking branch 'upstream/integration' into dev_web_main
create private desktops