Merge pull request #195 from owncloud/oc7launch2

Step 2 OC& Launch
Revert "Step 2 OC& Launch"
Merge pull request #196 from owncloud/revert-195-oc7launch2

Revert "Step 2 OC& Launch"
Revert "Revert "Step 2 OC& Launch""

This reverts commit 97a912d84452b022ab3da92ee3d227d34dc272f9.