Updated dto's and ConvertEntities
- service factory

- created service context factory
- created wordStoreContext
- removed misplaced services
fixed merge conflicts
Merge pull request #63 from teugis/master

Updated dto's and ConvertEntities
finalized wordstore context and factory
Merge remote-tracking branch 'upstream/master'
Merge pull request #64 from geertvh/master

added wordstore context and factory
Fixed id names in services.
Updated UserService.
Merged pull request from teugis/master