Work
Merge branch 'develop' of https://github.com/johbe559/schumacher into develop
Fail..
Merge
Reverted missing stuff...
Merge branch 'develop' of https://github.com/johbe559/schumacher into develop