Merge pull request #2280 from knabar/fix-timeit-import

Fix indirect import in webgateway
User filter id can be changed. Handle service options e.g. omero.group
Optionally return cell array with annotations for each input ID
Rename uid optional parameter as owner for clarity

In the long run we may want to differentiate between the annotation owner
and the annotation link owner.
Propagate owner param/key value to the getObjectTypeAnnotations functions
Unify and improve description of owner/flatten parameters
Improve description of flatten option
Merge pull request #2165 from dominikl/inplace_file_path

Inplace file path
Merge pull request #2207 from dominikl/limit_number_of_imports

Implemented maximum file size limit for import
Merge pull request #2293 from mtbc/legacy-cruft

clean up some old / deprecated code
Merge pull request #2253 from will-moore/webtest_getObjects_12169

limit webtest getObjects() to 10
Merge pull request #2036 from joshmoore/dsl-map-type

DSL Map Type
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating a7b8690..c8a8cc1
Merged PRs (fast-forward):
  # PR 1002 qidane 'Adding a Map type and MapAnnotation'
  # PR 1043 rleigh-dundee 'xsd-fu: Remove continued line inside genshi conditionals'

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

Repository: openmicroscopy/ome-documentation
Updating 6c60e92..235604e
Merged PRs (fast-forward):
  # PR 741 hflynn 'Remove Ubuntu versions which aren't supported by upstream (rebased onto develop)'
  # 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-latest-submods#79 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/79/)
Merge pull request #2295 from snoopycrimecop/merge/develop/submodules

Update develop submodules for map annotations!
Add Trusted-Only:true to the Insight manifest.

See http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/mixed_code.html#trusted_only
Don't sign the webstart jars by default.

We're going to be code-signing in a separate process, so this prevents jars being double-signed, once with the self-signed cert and once with a proper one.

The webstart-sign target is still there, so you can use `./build.py webstart-sign release-webstart`.
Add an external webstart signing script

Automatically run this script with the existing self-signed certificate as part of the standard docs/hudson/OMERO.sh build
cd target/ before doing the code-signing

This is so that ./build.py clean will remove any logs or temporary directories
Disable jar-signing in update-version target
Use system proxy environment variables