added spans for subtitles
Merge branch 'master' of https://github.com/TEDxVienna/2014-02-tedxamring-mobile

# By Thomas Ziegelbecker
# Via Thomas Ziegelbecker
* 'master' of https://github.com/TEDxVienna/2014-02-tedxamring-mobile:
  corrected collapse/expand bugs
  fixed #13
t-mobile logo changed