merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)
merge develop -D org -I include -E exclude: PR 394 (Update OMERO 5 and Formats docs to 2013-06)