Merge pull request #780 from melissalinkert/rebased/develop/fuji-line-endings

Fuji: make carriage returns optional (rebased onto develop)
Update auto-generated documentation

Repository: openmicroscopy/bioformats
Already up-to-date.

Generated by BIOFORMATS-docs-autogen-develop#112 (http://hudson.openmicroscopy.org.uk/job/BIOFORMATS-docs-autogen-develop/112/)