reformatting
Merge branch 'feature/EMR-3' into develop
Merge branch 'feature/EMR-2' into develop
Adding the correct struts login in the system
Merge pull request #18 from dubdabasoduba/feature/EMR-3

Feature/emr 3