json fixes, chart configs, other fixes
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE