adding models,mapping files and other edits
Identation Reformatting
adding more mapping file and minor edits
Merge pull request #30 from dubdabasoduba/feature/EMR-8

Feature/emr 8