Merge pull request #56 from DrJJ/staging

Merge staging branch
Merge branch 'master' into dat/model
Merge branch 'staging' into dat/model
More model support for endless tasks #54
Merge branch 'staging' of https://github.com/DrJJ/watdo into staging
Merge remote-tracking branch 'origin/staging' into jolly/gui