Small fixes from PR #603

Conflicts:

	omero/developers/Web/EditingOmeroWeb.txt
Merge pull request #605 from will-moore/small_fixes_from_PR603_develop

Small fixes from PR #603