typofix, and some other stuff
Merge branch 'master' of git@github.com:GKIFreiburg/gki_sickrd2014.git
Merge branch 'master' of git@github.com:GKIFreiburg/gki_sickrd2014.git