Allocate client object on heap instead of stack
Remove mentions of boost, as it is no longer required for the tests
Update Ice on Windows paragraph
Add entry from FAQ section to the Notes
Fix stylistic errors in text
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 240 (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..647af9e
Merged PRs:
  # PR 240 JesseCorrington 'merge Cpp doc fixes into develop'
  # PR 241 bpindelski 'Update Ice on Windows paragraph (rebased onto develop)'

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