Resolved merge conflicts

Added missing function and extends Model to Task and Componenet
Merge pull request #10 from Kirstyvox/master

Resolved merge conflicts