Add CUSTOM_SETTINGS_MAPPINGS functionality to additional apps' settings.py
Report settings from additional applications to log file
Simplify code by passing in current module similarly to other modules
Reinstate the syncmedia command

This commit reinstates the syncmedia command.  It is useful for people
who are deploying with other WSGI servers such as Gunicorn.
Add annotation and file IDs to FileAnnotation tooltip
Use the value not the rtype
Clean up code.
Return center instead of top left corner for point.
update date and clean
use getCenter method.
Make sure we do not have null context.
Remove Internal version text.
Import correct jar
Merge pull request #1793 from jburel/rebased/dev_4_4/point-mesure

Point mesure (rebased onto dev_4_4)
Merge pull request #1794 from jburel/rebased/dev_4_4/annotation-well

Related nodes (rebased onto dev_4_4)
Update dev_4_4 submodules

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

Repository: openmicroscopy/bioformats
Updating 4dd59b0..cc20830
Merged PRs (fast-forward):
  # PR 793 hflynn 'Changing Maia Scientific web link which is down'
  # PR 789 melissalinkert 'Metamorph: make certain that the reader is closed when openBytes returns'
  # PR 785 hflynn 'Renaming Bio-Formats daily build for Fiji'
  # PR 776 melissalinkert 'Fuji: make carriage returns optional'
  # PR 779 sbesson 'Fix link to Homebrew Github repository (rebased onto dev_4_4)'
  # PR 768 sbesson 'Improve bfCheckJavaPath performance testing (rebased onto dev_4_4)'
  # PR 673 melissalinkert 'Make configuration file suffix configurable'
  # PR 710 melissalinkert 'Data test updates (rebased onto dev_4_4)'

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

Repository: openmicroscopy/ome-documentation
Updating 0ab74f3..2d49b54
Merged PRs (fast-forward):
  # PR 552 manics 'Change var/logs/FSServer.log to var/log/FileServer.log (rebased onto dev_4_4)'
  # PR 550 will-moore 'Fix indent formatting with blank line'
  # PR 549 sbesson 'Document changes in scc 0.4.0 (rebased onto dev_4_4)'
  # PR 546 sbesson 'Redirect tablestest source link'
  # PR 542 ximenesuk 'Clarify pytest options (dev_4_4)'
  # PR 537 will-moore 'Web settings removal 11559'
  # PR 541 sbesson 'Add paragraph about Ice 3.5 server not supported under Windows'
  # PR 540 hflynn 'Adding JVM memory settings to main install docs (rebased onto develop) (rebased onto dev_4_4)'
  # PR 535 hflynn 'Update homebrew git link (rebased onto dev_4_4)'
  # PR 536 hflynn 'Adding JVM memory settings to main install docs'
  # PR 523 will-moore 'Web plugin docs 11559'
  # PR 526 qidane 'Simplify PDF to remove warning (rebased onto dev_4_4)'

Generated by OMERO-submods-stable#230 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-stable/230/)
Merge pull request #1791 from chris-allan/reinstate-syncmedia-4

dev_4_4: Reinstate syncmedia command
Merge pull request #1786 from chris-allan/fa-extended-metadata

dev_4_4: Add Annotation and OriginalFile IDs to OMERO.web FileAnnotation tooltip
Merge pull request #1789 from knabar/feature-omeroweb-additional-app-settings-4

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

Update dev_4_4 submodules