detectionresult ger ut orginalbilden också
fixat mergeconflict

Conflicts:
	src/edu/wildlifesecurity/framework/SurveillanceManager.java