Changed task model to account for users. Made minor changes to structure of getContent function in task model
Merge branch 'dev-set3-iteration4' of github.com:333fred/wpi-suite-tng into dev-set3-iteration4