Use a licensed version of Sublime Text for the screenshot
Merge pull request #67 from owncloud/use-licensed-sublime

Use a licensed version of Sublime Text for the screenshot
Merge pull request #81 from owncloud/oc7features

ownCloud Seven Features Page
Fix docs links, contact -> people, fix ml link, remove security link
Merge pull request #82 from owncloud/fix-footer-links

Fix docs links, contact -> people, fix ml link, remove security link
Fix dev docs link on contirbute
Fix contributor agreement pdf link
Apply #87 from Jan
Merge branch 'oc7features' of github.com:owncloud/www
Apply Franks install page fix
Merge branch 'master' of github.com:owncloud/www
Change /contributor to /user (3rd time lucky, slug change required in wp)
Merge pull request #92 from owncloud/change-contributor

Change /contribute to /user
Expand first section of each user type on seven features page
Make demo link open in new window
Merge pull request #94 from owncloud/fix-demo-link

Make demo link open in new window
Merge pull request #93 from owncloud/expand-sevenfeatures

Expand first section of each user type on seven features page
Merge pull request #89 from owncloud/conf-style-fix

Merge conf header with main nav bar