ICS writer: fix channel count correction
Merge remote-tracking branch 'origin/develop' into rebased/develop/ics-writer-fixes

Conflicts:
	components/scifio/src/loci/formats/out/ICSWriter.java
Merge pull request #386 from melissalinkert/rebased/develop/ics-writer-fixes

ICS writer: fix channel count correction (rebased onto develop)