- service factory

- created service context factory
- created wordStoreContext
- removed misplaced services
fixed merge conflicts
finalized wordstore context and factory
Merge remote-tracking branch 'upstream/master'
Merge pull request #64 from geertvh/master

added wordstore context and factory