Merge pull request #1266 from jbraeuer/master

Berlin 2014: Better program.
Added first proposals
Four more proposals and one suggestion
Tel Aviv change date
Tel Aviv change date
Tel Aviv change date
Tel Aviv change date
Updates to most of the pages
Updates to most of the pages
Merge branch 'master' of https://github.com/stude1/devopsdays-webby

Conflicts:
	site/content/events/2014-helsinki/sponsor/index.html
Merge remote-tracking branch 'upstream/master'
Merge pull request #1267 from stude1/master

First proposals and other updates for Helsinki 2014
Merge pull request #1268 from jbraeuer/master

Added code of conduct and anti-harassment policy for the Berlin event
Fixed listing of proposals
Merge remote-tracking branch 'upstream/master'
Fixed front page pic size
Merge pull request #1269 from stude1/master

Fixes to proposals list and front page for Helsinki 2014
Five additional proposals
Merge pull request #1270 from stude1/master

Five additional proposals for Helsinki 2014
Fixed title of Ilari Mäkelä's proposal