temp save to use gitlab
Merge remote-tracking branch 'remotes/github/master'
merge limace - wid15dimax2

Conflicts:
	include/PcoCamera.h
	src/PcoCamera.cpp
	src/PcoCameraUtils.cpp
merge - cosmetics