Use reverse('webgateway') for viewport_server. See #11451
Add HTTPS fastcgi param to nginx config template

Allows Django to detect the correct URL scheme
when running with nginx SSL support on.
Required when serving Insight via webstart over HTTPS.
See https://trac.openmicroscopy.org.uk/ome/ticket/10273
Activate nginx HTTPS fastcgi parameter

Should work for both HTTP and HTTPS
on nginx versions 1.1.11 and later.
Revert to conservative nginx https/fastcgi config

Let users amend the configuration based on their
environment to avoid side effects on older nginx setups.
fix private method name typo
fix #9961: check for existing file when saving attachments
replace static method using Guava
allow different file annotations with same name to be viewed
Update copyright dates in image-viewer. See #11435 & gh-1490
Merge pull request #1490 from will-moore/webgateway_json_404_11451_develop

Use reverse('webgateway') for viewport_server. See #11451
webgateway viewer allows multi-channel grey splitview. See #11285
Blitz renderSplitChannel() in grey has merged panel
Split Viewer panels labelled with channel names. See #11445
Allow multi-Ch with grey split-view in 'Edit' dialog
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating 77500c2..9c2c12a
Merged PRs (fast-forward):
  # PR 701 melissalinkert 'Remove erroneous build.properties files'
  # PR 684 melissalinkert 'AVI: fix byte count when skipping rows'
  # PR 693 sbesson 'Fix bfGetReader for MATLAB R2009a and earlier (rebased onto develop)'
  # PR 646 melissalinkert 'Save current revision number in memo file'

Repository: ome/scripts
Updating 5210f0f..64065ae
Merged PRs (fast-forward):
  # PR 38 ximenesuk 'Fix canvas height (rebased on develop)'

Repository: openmicroscopy/ome-documentation
Updating a8a899b..bbbd7d3
Merged PRs (fast-forward):
  # PR 474 hflynn 'OMERO.scripts docs (rebased onto develop)'
  # PR 471 bpindelski 'Clean up testing.txt (rebased onto develop)'
  # PR 462 mtbc 'Adjusted titles of continuous integration developer pages (rebased onto develop)'
  # PR 466 jburel 'Unify command to set web server.'
  # PR 467 hflynn 'Corrections to TIFF supporters urls'
  # PR 465 bpindelski 'index.txt: Correct typos on landing page.'

Generated by OMERO-submods-develop#195 (http://hudson.openmicroscopy.org.uk/job/OMERO-submods-develop/195/)
Merge pull request #1505 from zeb/rebased/develop/nginx-https-conf-10273-dev-4-4

Include fastcgi https parameter in generated nginx configuration
Merge pull request #1489 from snoopycrimecop/merge/develop/submodules

Update develop submodules
Merge pull request #1509 from will-moore/image_viewer_split_11285_develop

Image viewer split 11285 develop
Merge pull request #1506 from mtbc/rebased/develop/attachments-9961

fix #9961: interactive dialog before overwriting a local file (rebased onto develop)