Clarify PasswordUtil usage
Merge pull request #1801 from will-moore/private_group_chooser_10104_develop

Private group chooser 10104 develop
Merge pull request #1795 from jburel/npe-sdt

No modulo std
Merge pull request #1790 from chris-allan/reinstate-syncmedia

develop: Reinstate syncmedia command
Merge pull request #1770 from knabar/import-omeroweb-apps-from-pythonpath-develop

Don't require additional omeroweb apps to be within omeroweb
Merge pull request #1743 from mtbc/fix-deletelog

accommodate PL/pgSQL that logs deletes
Update develop submodules

Repository: openmicroscopy/openmicroscopy
Already up-to-date.

Repository: openmicroscopy/bioformats
Updating 2605dc9..b97a992
Merged PRs (fast-forward):
  # PR 794 hflynn 'Changing Maia Scientific web link which is down (rebased onto develop)'
  # PR 781 melissalinkert 'Add modulo annotation support for Zeiss CZI data'
  # PR 786 melissalinkert 'Remove libJWlz*.so from the lib/ directory'
  # PR 787 melissalinkert 'Cellomics: fix getSeriesUsedFiles to return the current series' files'
  # PR 784 hflynn 'Adding BF 5 to Fiji update docs'
  # PR 782 melissalinkert 'Make configuration file suffix configurable (rebased onto develop)'
  # PR 777 melissalinkert 'Various minor import fixes'
  # PR 780 melissalinkert 'Fuji: make carriage returns optional (rebased onto develop)'
  # PR 748 melissalinkert 'Add support for Bio-Rad .scn files'
  # PR 778 sbesson 'Fix link to Homebrew Github repository'
  # PR 771 rleigh-dundee 'Create source release artifact'
  # PR 773 rleigh-dundee 'C++ model template update 2'
  # PR 644 melissalinkert 'Add support for writing ModuloAlong* annotations'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Updating 01f6258..466262b
Merged PRs (fast-forward):
  # PR 551 manics 'Change var/logs/FSServer.log to var/log/FileServer.log'
  # PR 548 will-moore 'Web settings removal 11559 develop'
  # PR 545 sbesson 'Document changes in scc 0.4.0'
  # PR 544 ximenesuk 'Clarify pytest fixes and additions (rebase)'
  # PR 547 sbesson 'Redirect tablestest source link (rebased onto develop)'
  # PR 543 sbesson 'Add paragraph about Ice 3.5 server not supported under Windows (rebased onto develop)'
  # PR 539 ximenesuk 'Clarify pytest options'
  # PR 538 hflynn 'Adding JVM memory settings to main install docs (rebased onto develop)'
  # PR 534 hflynn 'Update homebrew git link'
  # PR 528 ximenesuk 'Document pytest on developer testing page'

Generated by OMERO-submods-develop#243 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/243/)
Merge pull request #1787 from chris-allan/fa-extended-metadata-5

develop: Add Annotation and OriginalFile IDs to OMERO.web FileAnnotation tooltip
Merge branch 'develop' into django-1.6

Conflicts:
	components/tools/OmeroWeb/omeroweb/urls.py
Merge pull request #1788 from knabar/feature-omeroweb-additional-app-settings

develop: Allow web apps to define their own settings
Merge pull request #1698 from snoopycrimecop/merge/develop/submodules

Update develop submodules
Retrieve group details at initialisation if not provided
Wrap long line
Add annotation ID to FileAnnotation tooltip in OMERO.insight
Merge pull request #1785 from dpwrussell/ldap-discover-fix

ldap discover username/password fix, paging and dn check
Fixing flake8 in ldap.
Only update OriginalFile if table was modified.

modified flag added to HdfStorage, TableI.close() checks this flag
fix #11693: prevent rename of user's current group
Add MATLAB ScriptFileType
Propagate 'omero.launcher' value to processor.py

For each launcher type, an 'omero.launcher.<TYPE>' configuration
setting is available so that an executable can be passed to the
processor.py service. For 'omero.launcher.python' special handling
of the empty string is available in order to make use of
sys.executable.