modified:   Analysis.ipynb
Modification of the z clustering strategy

	modified:   tracker/segmentation.py
Added suport for 2D case
Merge branch 'dev' of github.com:glyg/cell_migration into dev

Conflicts:
	notebooks/1 Segmentation and detection.ipynb
	notebooks/Segmentation_of_the_nuclei.ipynb
	notebooks/guillaume/Analysis.ipynb
	tracker/segmentation.py
Revert "Added suport for 2D case"

This reverts commit 306737e74f333fb970719cf3724b39bf7d7b802f.

Conflicts:
	tracker/segmentation.py
	modified:   tracker/segmentation.py
Revert "Added suport for 2D case"

This reverts commit 306737e74f333fb970719cf3724b39bf7d7b802f.
Added suport for 2D case
	modified:   2D detection.ipynb
Merge branch 'dev'

Conflicts:
	notebooks/guillaume/2-analysis.ipynb