Minor update
Merge remote-tracking branch 'origin/master'

Conflicts:
	OpenCV/OpenCV/DetectionByContours.cpp