Merge pull request #127 from stephenjust/dm-changes

Changes to Models and DataManager
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into remoteDataStore