+javadoc, +error handling
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE