some changes and bugfixes
Merge branch 'master' of https://github.com/StefanWaldraff/WebTech-SS13-G16