Merge branch 'master' into convertMain

Conflicts:
	depthOrderedGrouping/depthOrderedGrouping/LineFinder.cpp
	depthOrderedGrouping/depthOrderedGrouping/LineFinder.h
	depthOrderedGrouping/depthOrderedGrouping/imageDetails.cpp
	depthOrderedGrouping/depthOrderedGrouping/imageDetails.h
	depthOrderedGrouping/depthOrderedGrouping/main.cpp