Merge pull request #1267 from stude1/master

First proposals and other updates for Helsinki 2014
add code of conduct for berlin devopsdays
change sort order
Merge pull request #1268 from jbraeuer/master

Added code of conduct and anti-harassment policy for the Berlin event
Merge remote-tracking branch 'upstream/master'