some bugs fixed
Merge branch 'develop' of github.com:PDI-DGS-Protolab/hackaton-pixelquiz into develop