Merge pull request #175 from owncloud/master

Merge in design page updates
Merge branch 'master' into live
Merge branch 'master' of github.com:owncloud/www into live