merge confiiks
Merge branch 'master' of github.com:BRO-FHV/Scheduler