Removed filtering capabilities from model. Passing filtering to TaskController.
Merge branch 'staging' into dat/model