Merge branch 'master' into sonovo

Conflicts:
	libs/openFrameworks/communication/ofSerial.cpp
	libs/openFrameworks/video/ofGstVideoPlayer.cpp
Merge branch 'master' into sonovo

Conflicts:
	libs/openFrameworks/communication/ofSerial.cpp
	libs/openFrameworks/video/ofGstVideoPlayer.cpp