Updated ColorDetection to return keypoint
Merge branch 'master' of https://github.com/Aaes/TermiteTracker

Conflicts:
	GUI/TERMESConnector.cpp