Merge pull request #1348 from jbraeuer/master

Berlin 2014: Links videos and slides in program.
Add slides from Felix Hupfeld.