Merge pull request #37 from dubdabasoduba/feature/EMR-8

Feature/emr 8
adding uuid to work as the id's in the system