Merge remote-tracking branch 'tim/working_design'
Merge remote-tracking branch 'tim/working_design'
Merge branch 'working_design' of github.com:t-gerhard/ToMaTo
Various fixes
Merge branch 'master' into ba