updated core entities and services
updated entities and services
Merge branch 'master' of https://github.com/pguso/ladensia