Merge pull request #240 from JesseCorrington/cppDocFixes_develop

merge Cpp doc fixes into develop
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 241 (Update Ice on Windows paragraph (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating fba3536..fc3d796
Merged PRs:
  # PR 241 bpindelski 'Update Ice on Windows paragraph (rebased onto develop)'

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