Fixed bug in multi-channel bead registration
fixed another bug in setting up multiple tracks
Merge branch 'master' of github.com:fiji/fiji
Merge branch 'master' of github.com:fiji/fiji
Merge branch 'master' of github.com:fiji/fiji

Conflicts:
	src-plugins/SPIM_Registration/src/main/java/mpicbg/spim/io/SPIMConfiguration.java
Merge branch 'master' of github.com:fiji/fiji