make string truncation more robust
improve width-based string truncation for search result names

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/SearchResultTableModel.java
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating 3b856bc..fd9850d
Merged PRs (fast-forward):
  # PR 1237 sbesson 'Prepend Maven central in the pluginRepositories block (rebased onto develop)'
  # PR 1210 melissalinkert 'Zeiss LSM: fix offset calculationg for > 4GB files with SizeT > 1'
  # PR 1220 emilroz 'Czi expand metadata to all the channels (rebased onto develop)'
  # PR 1200 melissalinkert 'Fix off-by-one in LZW decoding'
  # PR 1218 rleigh-dundee 'travis: Switch from raring to saucy'

Repository: ome/scripts
Updating 9771f00..87ca83d
Merged PRs (fast-forward):
  # PR 90 bpindelski 'Avoid division by 0 in Plot Profile. (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Updating ce96fa7..08a33dd
Merged PRs (fast-forward):
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'
  # PR 913 sbesson 'Add switch-group info to user CLI page (rebased onto develop)'
  # PR 906 sbesson 'Fine tune config (rebased onto develop)'
  # PR 904 sbesson 'Update auto-generated properties'
  # PR 909 sbesson 'Remove limitations (rebased onto develop)'
  # PR 907 sbesson 'Breaking model (rebased onto develop)'
  # PR 908 sbesson 'Added documentation for Active Directory LDAP (rebased onto develop)'
  # PR 905 sbesson 'Adv config example (rebased onto develop)'
  # PR 887 sbesson '5.0.3: CLI documentation (rebased onto develop)'
  # PR 879 dpwrussell 'Added warning about web plugins to upgrade docs'
  # PR 891 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml (rebased onto develop)'
  # PR 888 sbesson 'Expand setup.py test/py.test options description (rebased onto develop)'
  # PR 889 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 886 ximenesuk 'DropBox note (rebased onto develop)'
  # PR 890 joshmoore 'New search docs (rebased onto develop)'
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'
  # PR 880 sbesson 'Release jobs redesign'
  # PR 878 sbesson 'Dco revert'
  # PR 874 mtbc 'add note about consequences of "damaging" in-place import files (rebased from dev_5_0)'
  # PR 882 sbesson 'OMERO.server properties: documentation template (rebased onto develop)'
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 869 joshmoore '12311 auto memory docs (rebased onto develop)'
  # PR 871 rleigh-dundee 'travis: Switch from raring to saucy'

Generated by OMERO-5.1-latest-submods#154 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/154/)
Unsuppress fs rename --no-move option.
Remove unused import.
Fix group user stub on search.html
Revert "Use 'image' as key, not 'images'". See #12476

This reverts most of commit 81ac72e50e16741b83343c823e522eda7639d452.

Conflicts:
	components/tools/OmeroWeb/omeroweb/webclient/controller/search.py
	components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/search/search.html
add SQL for filtering original files by repository
add repository DAO method for filtering files by repository
add API method for setting files' checksum
genericize Executor.Work

would be nice to do in general with Executor but that's a larger job
implement new repository method
test new repository method
Merge pull request #2865 from sbesson/rebased/develop/search_improvements_3

Latest changes/fixes for Insight search (rebased onto develop)
Remove unused import.
Hide zoom control in Search view

The controls do not perform any operation when in the
search mode.
Fix typo in help tips.
Merge remote-tracking branch 'remotes/origin/develop' into trac-12494-search-table-crash

Conflicts:
	components/insight/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/SearchResultTableModel.java
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)