customizing 'Orphaned images' container
add comment to settings.py
fixing custom template tag for retrieving settings

to display empty string instead of None
updating year in copyrights & spelling mistake
introducing hidden settings
adding default settings in process_custom_settings()
renaming hidden settings
adding comment to development settings
Update robotframwork readme file.
Fix a couple of errors and use markdown since this is an md document.
Standardise the report paths.
A few minor fixes.
Fix population of MapAnnotation.Value

The previous logic for setMapAnnotationValue was a no-op unless the
Value had already been set to non-null.  Now, as long as the
MapAnnotation object at the specified index is non-null (i.e.
setMapAnnotationID(...) has been called), the Value attribute will be
set.
Merge pull request #2235 from aleksandra-tarkowska/trash_name_config

customizing 'Orphaned images' container
Merge pull request #23 from melissalinkert/map-value-fix

Fix population of MapAnnotation.Value
Add null check for value map
Merge pull request #2292 from ximenesuk/robot-readme-dev

Update robotframework readme file. (rebased)
merge develop -D none -I breaking -E exclude: PR 2036 (DSL Map Type)
merge develop -D none -I breaking -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2269 dominikl 'ROI improvements' (user: dominikl)
  # PR 2128 jburel 'Open with develop' (user: jburel)
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (user: dpwrussell)
  # PR 2207 dominikl 'Implemented maximum file size limit for import' (user: dominikl)
  # PR 2256 will-moore 'Tablet drag handling' (user: will-moore)
  # PR 2258 will-moore 'Truncate js tree dynamically 12161' (user: will-moore)
  # PR 2268 dominikl 'Remove last file annotation' (user: dominikl)
  # PR 2311 hflynn 'Fix for 11674 - script doc links (rebased onto develop)' (user: hflynn)
  # PR 2253 will-moore 'limit webtest getObjects() to 10' (user: will-moore)
  # PR 2293 mtbc 'clean up some old / deprecated code' (user: mtbc)
  # PR 2160 dominikl 'Warning dialog before deletion of linked images' (user: dominikl)
  # PR 2295 snoopycrimecop 'Update develop submodules' (user: snoopycrimecop)
  # PR 2270 will-moore 'Disk space 12126' (user: will-moore)
  # PR 2291 aleksandra-tarkowska 'Zoom display' (user: aleksandra-tarkowska)
  # PR 2280 knabar 'Fix indirect import in webgateway' (user: knabar)
  # PR 2240 will-moore 'Search image id 12151' (user: will-moore)
  # PR 2305 aleksandra-tarkowska 'Birdeyeview bugs' (user: aleksandra-tarkowska)
  # PR 2165 dominikl 'Inplace file path' (user: dominikl)
  # PR 2182 joshmoore 'Read only flag' (user: joshmoore)
  # PR 2308 mtbc 'remove erroneous bitsize update' (user: mtbc)
  # PR 2304 jburel 'Remove group during import (rebased onto develop)' (user: jburel)
  # PR 2244 aleksandra-tarkowska 'Webstart access limited' (user: aleksandra-tarkowska)
  # PR 2301 mtbc 'fix #12193: replace FilesetVersionInfo with map property on Fileset' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 2036 joshmoore 'DSL Map Type'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)' (user: melissalinkert)
  # PR 1050 melissalinkert 'Add the series index to the default image name (rebased onto develop)' (user: melissalinkert)
  # PR 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)' (user: melissalinkert)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (user: melissalinkert)
  # PR 1041 melissalinkert 'Minor docs autogen fixes (rebased onto develop)' (user: melissalinkert)
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)' (user: melissalinkert)
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value' (user: melissalinkert)
  # PR 1053 melissalinkert 'SVS: store the PhysicalSizeX and PhysicalSizeY attributes' (user: melissalinkert)
  # PR 1042 melissalinkert 'OME-XML package bug-fix (rebased onto develop)' (user: melissalinkert)
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)' (user: melissalinkert)
  # PR 1014 bpindelski 'Add initial structure for decompressing JPEG XR images (assist #8493).' (user: bpindelski)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (user: melissalinkert)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (user: melissalinkert)
  # PR 1030 melissalinkert 'CZI: restrict dimension adjustment (rebased onto develop)' (user: melissalinkert)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1031 melissalinkert 'Volocity: parse timestamps from .atsf files (rebased onto develop)' (user: melissalinkert)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (user: melissalinkert)
  # PR 1029 melissalinkert 'TIFF: adjust optimal tile height if tiles have height of 1 (rebased onto develop)' (user: melissalinkert)
Updating a7b8690..5a66dd8
Merged PRs (fast-forward):
  # PR 1043 rleigh-dundee 'xsd-fu: Remove continued line inside genshi conditionals'

Merged PRs:
  # PR 1002 qidane 'Adding a Map type and MapAnnotation'

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

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 741 hflynn 'Remove Ubuntu versions which aren't supported by upstream (rebased onto develop)' (user: hflynn)
Updating 6c60e92..54672e8
Merged PRs (fast-forward):
  # PR 740 hflynn 'Updating insight contributing file (rebased onto develop)'
  # PR 739 hflynn 'Unix/Linux installation: Update requirements (rebased onto develop)'
  # PR 735 sbesson 'Proposal to add integration jobs as downstream of the push job'
  # PR 733 ximenesuk 'Clarify location and group for DropBox imports. (rebased)'
  # PR 734 hflynn 'Improvements to import scenarios (rebased onto develop)'

Generated by OMERO-5.1-breaking-push#29 (http://ci.openmicroscopy.org/job/OMERO-5.1-breaking-push/29/)