TrackMate_: minor GUI polishing

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
TrackMate_: disambiguate edge and track features

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
TrackMate_: backward compability with file formats from v1.2 to 2.1.0

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
TrackMate_: empty TODO list

Old suggestions were not worth keeping. Let's see how new ideas arrive
from other users.
Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
Merge remote-tracking branch 'origin/master' into track-mate

Conflicts:
	Build.sh

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>
Merge branch 'db-registration-tl'

Conflicts:
	src-plugins/Descriptor_based_registration/src/main/java/process/OverlayFusion.java
fixed two bugs in the overlay fusion for the descriptor based registration
Updater_Fix.js: Make sure that ij.IJ is found

Noticed by Vassilis Kehayas in bug 631.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a little utility to update the URLs in Updater_Fix.js

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Update the URLs in Updater_Fix.js to the newest, latest & greatest

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Trainable Weka Segmentation: added method to create instances in place.
Trainable Weka Segmentation: create instances in place to improve speed.
Merge branch 'trainable-seg-gui'

Merge last changes to improve speed and memory use.
Merge branch 'master' of https://github.com/fiji/fiji
difference-of-mean does not ignore minmaxset anymore
Merge branch 'master' of github.com:fiji/fiji
QuickPALM: fix NullPointerException

When the full count of threads was not needed, a couple of the elements
in the threads array are still null. Let's not try to join() these.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Build.sh: handle 'fiji' and 'ImageJ' target again

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Update .gitignore for current ImageJ2

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Weed out .gitignore some

I might have been overzealous in parts, but I always can but things
back...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>