Small fixes from PR #603

Conflicts:

	omero/developers/Web/EditingOmeroWeb.txt
Fix OMERO.server directory in server upgrade section

- Fix OMERO.server directory name (removing undesired .zip)
- Add recommended symlinking to simplify subsequent steps with
  $ cd OMERO.server
Fix documentation for the FLIM OME-TIFF sample

FLIM-modulo-sample.ome.tiff has SizeC set to 2 and SizeT set to
16 (2 timepoints x 8 bins).
Merge pull request #627 from melissalinkert/flim-sample

Clarify documentation for the FLIM OME-TIFF sample
Tidying webclient plugin page
Tidying dev_5/develop only section
Tidying suggested by Mark
Further tidying
Merge pull request #605 from will-moore/small_fixes_from_PR603_develop

Small fixes from PR #603
Merge pull request #628 from hflynn/rebased/develop/rebased/dev_5_0/webplugin_tidy

Tidying webclient plugin page (rebased onto dev_5_0) (rebased onto develop)
Merge pull request #606 from sbesson/rebased/develop/server_upgrade_bugfix

Server upgrade bugfix (rebased onto develop)