modified:   src/application/VisualAppDemo/objectNotVisibleTerminate.cpp
Merge branch 'master' of https://github.com/Sapphire1/mrrocpp

Conflicts:
	src/application/VisualAppDemo/objectNotVisibleTerminate.cpp

	modified:   src/application/VisualApp/IBReading.h
	modified:   src/application/VisualApp/ib_eih_visual_servo.cc
	modified:   src/application/VisualApp/visual_servo.cc
	modified:   src/application/VisualAppDemo/objectNotVisibleTerminate.cpp
	modified:   src/application/VisualAppDemo/object_reached_termination_condition.h