Implement wmoore's suggestion re version numbers.
merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 386 (Update download link in read me)
merge develop -D org -I include -E exclude: PR 389 (Updating omero_plone links to point at OME 5 product pages)
merge develop -D org -I include -E exclude: PR 391 (Change instances of 'OMERO.fs' to code version numbers)