Merge pull request #11 from melissalinkert/dev_4_1

Comment out alternate ND2 dimension parsing
Detect multi-channel data

Pixel data is stored contiguously, but each channel is identified by a
spearate stream.  So it is simply a matter of counting the streams to
determine the correct channel count.
(cherry picked from commit b7338204bab7509d3a54b78c4d121b9584bf415f)

Conflicts:

	components/bio-formats/src/loci/formats/in/AmiraReader.java
Merge pull request #20 from melissalinkert/4_1-amira-fixes

4 1 amira fixes
Strip extra padding byte from Color24 data

To test:

ant -Dtestng.directory=$DATA/ivision test-automated
(cherry picked from commit cc89c0f3be33cd8eec183e8ef12456c39cb5b69f)
Merge pull request #25 from melissalinkert/color24-ivision

Strip padding byte from Color24 iVision data
Remove debugging statements
Prevent NPEs when parsin ROI data
Prevent NPEs when parsing detector gain and offset
Insert default detector when relevant metadata is missing
Merge pull request #50 from melissalinkert/leica-lif_4_1

Leica LIF 4_1
QuickTime: add support for the 'tiff' codec
Merge pull request #65 from melissalinkert/quicktime-tiff-4_1

QuickTime TIFF 4.1
Backport of Slidebook fixes to 4.1.x
Merge pull request #90 from melissalinkert/slidebook-backport

Slidebook backport
Zeiss LSM: do not populate the EmWave

This allows the channel colors to be set correctly.
Merge pull request #99 from melissalinkert/lsm-remove-exwave-4_1

Zeiss LSM 4.1: remove EmWave
Fixed how 32-bit AVIs are handled.

(cherry picked from commit d522ff8793bdd408da46a652ede8703c41986d3f)
Fixed a few more bugs with reading/writing AVI files.  Exported RGB AVIs should now open in QuickTime Player.

(cherry picked from commit 191a428a091b71caab9b1e735592c0634efbd459)

Conflicts:

	components/bio-formats/src/loci/formats/out/AVIWriter.java
Fixed BGR correction when opening sub-images.  See QA #2583.

(cherry picked from commit a63312f7daa282f99073a699c7c4e4bb8c360b7f)
Added support for multi-chunk AVI files.

(cherry picked from commit 7afc9c794fd457a71d8123a93e34c7acd3372346)

Conflicts:

	components/bio-formats/src/loci/formats/in/AVIReader.java