[OE-3301] syncing work
Merge branch 'demo/orbis' of github.com:openeyes/OpenEyes into demo/orbis