Updated camera/rayonixhs
Merge branch 'master' of github.com:esrf-bliss/Lima

Conflicts:
	camera/rayonixhs