Merge pull request #156 from owncloud/events

Events pages
use plain http for conf page since it does not use SSL
remove the word 'hipster' in front of Berlin …
Merge pull request #160 from jancborchardt/master

use plain http for conf page since it does not use SSL
fix link to design page on contribute page
Merge branch 'master' into events