[OE-3765] Fixing the cancel and save buttons
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop