Michael's desktop
Merge branch 'master' of https://github.com/morellid/featureBasedScheduling