Merge branch 'eventscontact' of github.com:owncloud/www
Merge branch 'master' of github.com:owncloud/www