more changes by tommy
Merge branch 'master' of https://github.com/rberidon/plannd
more by tommy