Changed jaggery-entity to entity
Merge branch 'master' of https://github.com/splinter/jaggery-entity