Merge pull request #1 from infinityplus/developments

Developments
Merge pull request #2 from infinityplus/developments

Developments
Merge pull request #3 from infinityplus/developments

Developments
phase 02 one table done and 1-1 table mapping started