Added metamodel to be used for joins in jpa criteria
Merge remote-tracking branch 'origin/master'