Merge pull request #148 from PatientView/feature/16-ECR-integration

Feature/16 ecr integration
Merge branch 'develop' into feature/16-ECR-integration