removed annotations and introduced orm.xml
moved entities in place of model object
reverted
imports
added missing eager fetch type
Removing string concatenation for entities
Merge branch 'AGPUSH-566'