Changes to entities and services
Merge branch 'master' of https://github.com/ithillel/Xipiv.git