modified:   src/application/VisualApp/visual_servo.cc
	modified:   src/application/VisualAppDemo/ball_recognition.ini
	modified:   src/application/VisualAppDemo/beginvisiblecondition.cpp
	modified:   src/application/VisualAppDemo/hybridbegcondition.cpp
	modified:   src/application/VisualAppDemo/object_reached_termination_condition.cc
	modified:   src/application/VisualAppDemo/reactivevisualservotask.cpp
	modified:   src/application/VisualAppDemo/terminate_beg_pos_condition.cc
Merge branch 'master' of https://github.com/Sapphire1/mrrocpp

Conflicts:
	src/application/VisualAppDemo/object_reached_termination_condition.cc
	src/application/VisualAppDemo/reactivevisualservotask.cpp

	modified:   src/application/VisualApp/reactive_task.h
	modified:   src/application/VisualAppDemo/beginvisiblecondition.cpp
	modified:   src/application/VisualAppDemo/hybridbegcondition.cpp
	modified:   src/application/VisualAppDemo/object_reached_termination_condition.cc
	modified:   src/application/VisualAppDemo/reactivevisualservotask.cpp
	modified:   src/application/VisualAppDemo/reactivevisualservotask.h
	modified:   src/application/VisualAppDemo/visual_arm_behaviour.cc
	modified:   src/application/VisualAppDemo/visual_arm_behaviour.h
	modified:   src/application/VisualAppDemo/visual_behaviour.cc
	modified:   src/application/VisualAppDemo/visual_behaviour.h
	modified:   src/sensor/discode/discode_sensor.cc