Fixed edit button in marking page. Added media query in style.css
Reverted to initial tests
Merge branch 'cebo_unittests' into develop