First 2 proposals for Berlin 2014.
Mention discount deals of Kalkscheune.
Merge pull request #979 from jbraeuer/master

Berlin 2014 - first proposals, location update