Merge pull request #355 from melissalinkert/rebased/develop/yet-another-photoshop-tiff-fix

Photoshop TIFF: ignore layers if the channel count is wrong (rebased onto develop)
Move license-maven-plugin config off the server

Previously, we stored the license configuration at:

    http://code.imagej.net/licenses

But it was a pain to keep that updated and in sync with the codebase
here. It makes more sense to use a local license resolver.

Thanks to Johannes Schindelin for the idea.
Add project.rootdir that always points to toplevel

This is a bit of a burden to maintain when projects are added or moved,
but makes it easier to point to files off the root path. Usually doing
so is a bad idea anyway, but in some cases it is nice to have access to
shared configuration, such as the files in the license folder.
Update copyrights and licenses

This was done using the commands:

    mvn license:update-project-license
    mvn license:update-file-header
Extend copyright year range to 2013

It was done with the following shell command:

    git grep -l 'Copyright (C) [0-9]\{4\} - [0-9]\{4\}' | \
    xargs sed -i '' -e \
    's/\(Copyright (C) [0-9]\{4\} - \)[0-9]\{4\}/\12013/'

The license-maven-plugin would normally do it for us. Unfortunately, it
cannot, because we have the canUpdateCopyright flag set to false, so the
update-file-header goal cannot update the copyright year range on files
with existing headers. The flag must be false because otherwise, it
would overwrite each file's copyright holders (we have a few files with
non-default copyright holders listed, which we want to preserve).

In the future, we could address the issue by contributing an enhancement
to license-maven-plugin that splits canUpdateCopyright into two parts:
canUpdateCopyrightYears and canUpdateCopyrightAuthors.
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 342 (setId performance improvements)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 349 (Fix Eclipse AssumeNG errors (see #10238))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 351 (Add SPW support to FakeReader)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 356 (License updates)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 55b680e..948c5e4
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 349 bpindelski 'Fix Eclipse AssumeNG errors (see #10238)'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 356 ctrueden 'License updates'

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