(WIP)
Merge branch 'trackmate-2.5' of github.com:knime-ip/knip into trackmate-2.5

Conflicts:
	org.knime.knip.tracking/src/org/knime/knip/tracking/nodes/trackmate/TrackmateTrackerNodeDialog.java
	org.knime.knip.tracking/src/org/knime/knip/tracking/nodes/trackmate/TrackmateTrackerNodeModel.java