Merge branch 'eventscontact' of github.com:owncloud/www
Merge branch 'master' of github.com:owncloud/www
Added conference signup page. Add a page with slug 'register' and parent 'conf'
Add register button from /conf page
Change page title
Add thankyou page. 'thankyou' slug, with 'conf' parent
Merge pull request #239 from owncloud/conferencesignup

Add conference singup page
Merge pull request #242 from owncloud/master

Update live