Revert certain files to 'develop' branch of openeyes - only whitespace changes