Removed QuadWarp param.
Added offset facility to QuadWarp class.
Fixed merge.
Screens should now be ordered properly, can't check though as I don't have a second screen.

Merge branch 'master' of github.com:sebleedelisle/PixelPyros

Conflicts:
	PixelPyros/bin/data/laserCalibrationSettings.xml
	PixelPyros/src/ControlPanels/ControlPanels.cpp
	PixelPyros/src/ofApp.cpp
	SharedCode/Homography/QuadWarp.cpp
	SharedCode/Laser/LaserManager.cpp