zwischenstand
Merge branch 'master' of github.com:Jimbo-Delta/KDD-WS-14-15
TRANS