Refactor enable/disable code and add docs
Resolve compile issues
Print win service info in admin diagnostics
merge dev_4_4 --exclude conflict needs-fixes broken: PR 536 (Insight import location)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 538 (OMERO.tables ArrayColumns #5632)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 539 (Fix initialisation of username on Windows)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 545 (Jshint compliance 9927)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 552 (Channel naming 100022)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 558 (Plugin dependencies)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 565 (Web bugs 18th dec)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 569 (Add .travis.yml configuration)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 574 (Add gcc from dupes)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 576 (Modulo retrieve)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 580 (Improve error handling during import (See #10090))
merge dev_4_4 --exclude conflict needs-fixes broken: PR 581 (No longer remove tabs if big images. (close #10035))
merge dev_4_4 --exclude conflict needs-fixes broken: PR 582 (Preserve 1:1 relationship between Channel and LogicalChannel)
merge dev_4_4 --exclude conflict needs-fixes broken: PR 583 (Print win service info in admin diagnostics)
merge dev_4_4 --exclude conflict needs-fixes broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 536 scottlittlewood 'Insight import location'
  # PR 538 manics 'OMERO.tables ArrayColumns #5632'
  # PR 539 bpindelski 'Fix initialisation of username on Windows'
  # PR 545 will-moore 'Jshint compliance 9927'
  # PR 552 will-moore 'Channel naming 100022'
  # PR 558 jburel 'Plugin dependencies'
  # PR 565 will-moore 'Web bugs 18th dec'
  # PR 569 joshmoore 'Add .travis.yml configuration'
  # PR 574 joshmoore 'Add gcc from dupes'
  # PR 576 jburel 'Modulo retrieve'
  # PR 580 jburel 'Improve error handling during import (See #10090)'
  # PR 581 jburel 'No longer remove tabs if big images. (close #10035)'
  # PR 582 melissalinkert 'Preserve 1:1 relationship between Channel and LogicalChannel'
  # PR 583 bpindelski 'Print win service info in admin diagnostics'
Conflicting PRs (not included):
  # PR 575 manics 'Handle internal SecurityViolation in openTable #10049'
  # PR 578 will-moore 'Editinplace bugs'

Repository: openmicroscopy/bioformats
Updating 03770c0..f67c645
Merged PRs:
  # PR 324 melissalinkert 'Documentation updates'

Repository: ome/scripts
Updating 3587c87..f1abf9e

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..3ad387a
Merged PRs:
  # PR 179 sbesson 'CLI documentation'
  # PR 193 manics 'Tables documentation partial rewrite 9957'
  # PR 196 sbesson 'Continuous integration'

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