Refactored dtos to use entities
Merge branch 'master' of https://github.com/SingletonTheory/SingletonTheory.Services