fixed entity transformation - Elastic Search
Merge branch 'develop' of github.com:Stratio/stratio-deep into develop

Conflicts:
	deep-jdbc/pom.xml