Fix conflicts
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)
ome-xml: Update with openmicroscopy dev_4_4 branch