[warsaw-2014] update program and proposals page
[warsaw-2014] fix for proposal and proposals pages
Merge pull request #1264 from liku/master

[warsaw-2014] fix for proposal and proposals pages. update program
Berlin: Closed Silver Sponsoring
Merge pull request #1265 from jbraeuer/master

Berlin: Closed Silver Sponsoring
Berlin 2014: Improve program.
Merge remote-tracking branch 'jedi4ever/master'
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
add code of conduct for berlin devopsdays