fixed pom.xml, started with entities
Merge remote-tracking branch 'origin/master'