Fixed conflict issues
Merge branch 'feature/front-end-rewrite' of https://github.com/openeyes/OphCiExamination into feature/front-end-rewrite