Several small bugfixes.
Merge branch 'master' of https://github.com/gruppe28/fp2014.git