merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)
merge develop -D org -I include -E exclude: PR 486 (put permissions warning into a proper warning box (rebased onto develop))
merge develop -D org -I include -E exclude: PR 487 (Fix Java code examples (rebased onto develop))