Last few fixes since refactoring
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop