Merge pull request #1300 from jburel/edit-channels

Channel edit
Merge pull request #1304 from jburel/thumbnail-loader

Thumbnail loader
Merge pull request #1288 from joshmoore/11109-chgrp

11109 chgrp fails on links
Merge pull request #1270 from will-moore/move_to_dataset_10917_develop

Show chgrp target tree if Projects OR Datasets exist. See #10917
Merge pull request #1305 from jburel/mif-target-bug

Mif target bug
Log the fact that link could not created during transfer.

The error is expected when moving data and orphaned images
if the image is part of a mif.
Update submodules for tag v.5.0.0-beta1
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1287 (Matlab examples fix (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1308 (lib/repository/Image_5D-1.2.0.jar: Remove)
merge develop -D org -I include -E exclude: PR 1309 (Log error)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1287 sbesson 'Matlab examples fix (rebased onto develop)'
  # PR 1308 rleigh-dundee 'lib/repository/Image_5D-1.2.0.jar: Remove'
  # PR 1309 jburel 'Log error'

Repository: openmicroscopy/bioformats
Updating 3a84df1..6377b4f
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 556 bpindelski 'Add ``mkfake`` tool'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 394 qidane 'Update OMERO 5 and Formats docs to 2013-06'

Generated by OMERO-merge-develop#326 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/326/)