settings
New sequences, new laser calibration, abandoned attempt to get a diff image on screen.
Merge branch 'master' of https://github.com/sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/bin/PixelPyros.app/Contents/MacOS/PixelPyros
	PixelPyros/bin/data/settings/triggerSettings.xml
	PixelPyros/bin/data/warpdata/network cam1.xml
	PixelPyros/bin/data/warpdata/rightScreen.xml