add tables and entity
the duplicated mapping have been deleted
Merge pull request #540 from olga-jane/sidorov_NewComponentry1stPhase

Sidorov new componentry1st phase