Merge pull request #605 from will-moore/channel_naming_100022

Channel naming 100022 (develop)
Merge pull request #603 from will-moore/9918_tag_edit

9918 tag edit develop
Merge pull request #604 from will-moore/web-bugs-18thDec

Web bugs 18th dec (develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 577 (9821 Major FS refactoring)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 587 (Modulo retrieve (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 592 (C++ fixes for building with Ice >= 3.4)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 599 (scons: Update to version 2.2.0)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 602 (Roi test develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 606 (Jshint compliance 9927 (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 609 (Improvements to windows service user (see #10095) (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 577 joshmoore '9821 Major FS refactoring'
  # PR 587 jburel 'Modulo retrieve (rebased onto develop)'
  # PR 592 rleigh-dundee 'C++ fixes for building with Ice >= 3.4'
  # PR 599 rleigh-dundee 'scons: Update to version 2.2.0'
  # PR 602 jburel 'Roi test develop'
  # PR 606 will-moore 'Jshint compliance 9927 (develop)'
  # PR 609 bpindelski 'Improvements to windows service user (see #10095) (rebased onto develop)'

Repository: openmicroscopy/bioformats
Updating 55cf7fd..56a6610
Merged PRs:
  # PR 338 melissalinkert 'Slidebook channel count (develop)'
  # PR 340 melissalinkert 'Use better schema documentation links (rebased onto develop)'
  # PR 341 melissalinkert 'Docs enhancements (rebased onto develop)'
  # PR 342 melissalinkert 'setId performance improvements'

Repository: ome/scripts
Updating 457e85a..272c83a

Repository: openmicroscopy/ome-documentation
Updating 2e32665..e38561d
Merged PRs:
  # PR 210 bpindelski 'Update Windows docs (see #10095) (rebased onto develop)'

Generated by OMERO-merge-develop#116 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/116/)