Added entities
Ended entity mapping
Merge branch 'feature/persistence_unit' into develop