SurfFeatureDetector has been added
Merge branch 'master' of github.com:lblsa/roombara

Conflicts:
	test_motion_tracking/src/main.cpp