Sync Task and Category with UML diagram
Merge remote-tracking branch 'origin/master'