Merge branch 'task-manager-base' into dev-gradle
Merge remote-tracking branch 'origin/dev-gradle' into UI-design