Merge pull request #17 from kvedananda/dev

Service layer changes
Service controller returns EntityCollection containing EntityModel

- Removed code in model navigator that was doing this