Upgraded Netways from silver to gold
typo corrected
Merge pull request #280 from gergnz/master

Remove Adrian's talk, and add Sam's.
merged with upstream
Merge pull request #277 from IngmarKrusch/master

Berlin Sponsor update for Netways
Christian Beedgen: Arm your DevOps Team with Big Data. Submitted by Alyssa McManmon <amcmanmon@trainercomm.com>
Brett Gailey: Continuous Integration with Packages  A Not So Scary Deployment Model
Merge pull request #282 from rberger/ContinuousIntegrationWithPackagesANotSoScaryDeploymentModel

Brett Gailey: Continuous Integration with Packages  A Not So Scary Deployment Model
Merge pull request #283 from gergnz/master

Add a talk from Julian, and AWS as a sponsor
Berlin: added axel springer as gold sponsor
Berlin: added axel springer as gold sponsor
Berlin: update idealo logo with a better resolution
Merge remote-tracking branch 'upstream/master'
Berlin: shorter opeing open space, created therefore an additional open space slot
Berlin: fix typo in ignite program
Merge pull request #281 from rberger/ArmYourDevOpsTeamWithBigData

Christian Beedgen: Arm your DevOps Team with Big Data.
Merge pull request #284 from IngmarKrusch/master

Berlin: sponsor update (add axel springer, better logo for idealo) and program update
Added Joan Touzet: Coming to Terms with Chef: A Support Group for the Weary and Downtrodden Admin. Submitted by Al McKeon <amckeon@daviesmurphy.com>
Nick Peterson: Getting Started with CloudScript
Ignite Talk: Juan Delgado: Gitnite Your Deployment