Update Twitter
Merge pull request #18 from th-h/thh-20140911

Vortrag September 2014.
Merge branch 'upstream' into thh-20140911

* upstream:
  Update Twitter