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
Image_Expression_Parser: fix dependency version

This version 2.4.1 depends on jama:Jama:1.0.2, when the artifact is
actually available as jama:jama:1.0.2. Not sure exactly how that
happened, but updating to the latest SNAPSHOT version fixes the build.

This is probably what we want anyway, so that the entire multi-module
reactor stays consistent. Otherwise, it is rather unintuitive for the
Image_Expression_Parser to depend on jep, but not the version of jep
actually being built during that same build!
fixed threshold for integral image bead based registration
Merge branch 'master' of github.com:fiji/fiji
can provide a current guess of the deconvolved image,
allows to continue deconvolution
Merge branch 'master' of github.com:fiji/fiji
formalized loading of previous image including range check
fiji-lib: add NumberParser class

This class allows for worldwide parsing of numbers by respecting the
current Locale, unlike Integer.parseInt, Double.parseDouble, etc.

For details, see e.g.:
http://www.ibm.com/developerworks/java/library/j-numberformat/
TrackMate_: fix some dependency versions

Many of these worked by accident. The version of other sc.fiji projects
should be ${project.parent.version}, while the version of ImgLib2
dependencies should be ${imglib2.version}. Using ${imagej.version}
happened to work for now, since it is also at 2.0.0-SNAPSHOT here, but
the latest pom-scijava fixes version properties to release versions, and
the version numbers will inevitably diverge over time.
TrackMate_: use fiji-lib's NumberParser

This makes number parsing sensitive to the current locale, which should
allow numbers written with the expected local format to be parsed.
.gitignore: Add more jar files

Some are for Bio-Formats/SCIFIO, some for JUnit, and some for TestNG.
Update imglib submodule pointer

The pointer now corresponds to the state of master for the 2.0.0-beta-7
release of ImgLib2.

The imglib2-io project now depends on Bio-Formats 4.4.x releases, which
definitely has the MetadataTools.createOMEXMLMetadata() method. So
hopefully this change will fix the Fiji-daily build.
Merge pull request #22 from fiji/number-parsing

TrackMate number parsing
This merge result will be then uploaded to the update site, and left there for testing.
Merge branch 'master' into SpimDeconvolutionOnGPGPU

updating from fiji upstream/master