Merge branch 'master' of https://github.com/PimV/GettingThingsDone.git