OpenCV display fix
Merge remote-tracking branch 'origin/origin/master'

Conflicts:
	src/org/myrobotlab/control/ProgramABGUI.java