Zeiss LSM: use the longer display channel name

...instead of the shorter data channel name.

Conflicts:

	components/bio-formats/src/loci/formats/in/ZeissLSMReader.java
Merge pull request #589 from melissalinkert/lsm-channel-names-develop

Zeiss LSM: use the longer display channel name