WIP
Merge branch 'www'

 of ssh://erinet/~/git/Studium/textmining into www
cleanup deadcode
Merge branch 'master' into www