TaskManager done with dummy content
Merge branch 'gerard'