OK
Merge branch 'master' of https://github.com/joelrandria/analyse_tp1

Conflicts:
	tp1/GradientMapMax.cpp
	tp1/GradientMapMax.h
	tp1/InteractiveEdgeDetectionDialog.cpp