[OE-3649] Completed markup integration
Merge branch 'feature/front-end-rewrite' of github.com:openeyes/OpenEyes into feature/front-end-rewrite