PSR2 compliance changes
Merge branch 'release/1.4' of ssh://github.com/openeyes/OpenEyes into release/1.4