On linux CImg.h  uses Xlibs  so rmoved USE_CIMG from #defines
fixed conflict
Merge branch 'master' of https://github.com/discordj/QCameraRemoteControl

Conflicts:
	cameratetherwidget.h