dummy ready
Merge remote-tracking branch 'origin/stable'
moved docroot
merge with lars
Merge branch 'master' into stable
restored cloudctrl stuff