Add initial work on conference page
add first text to conference page
add more stuff to the conf page
fix little mistake in hashtag
Merge branch 'master' of github.com:owncloud/www into conference
Merge branch 'master' into conference
Rename conf page, add styles, add logo
Add exception for conference page
Add some indentation
Adjust layout to bootstrap 3
Fix margin issue.
Layout tweaks after import.
Fix typos and remove events page link
Merge branch 'master' of github.com:owncloud/www into conference
Merge pull request #46 from owncloud/conference

Add conference page