Merge pull request #207 from sbesson/rebased/develop/2571_cli_improvements

CLI documentation (rebased onto develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 210 (Update Windows docs (see #10095) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 2e32665..e38561d
Merged PRs:
  # PR 210 bpindelski 'Update Windows docs (see #10095) (rebased onto develop)'

Generated by OMERO-merge-develop#116 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/116/)