[OE-3485] Styleguide fixes
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop