Revert "Revert "Merge branch 'oc7launch2'""

This reverts commit 0589bff8a3710f403257f9ac4eae925933407fc1.
Update version numbers
Merge pull request #195 from owncloud/oc7launch2

Step 2 OC& Launch