inergration update
dd
fsdMerge branch 'master' of https://github.com/davidkrantzy/My-Screen

Conflicts:
	ImageProcessing/ImageProcessing/bin/Debug/DataHandler.dll
	ImageProcessing/ImageProcessing/bin/Debug/DataHandler.pdb
	ImageProcessing/ImageProcessing/bin/Debug/ImageProcessing.exe
	ImageProcessing/ImageProcessing/bin/Debug/ImageProcessing.pdb
	ImageProcessing/ImageProcessing/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ImageProcessing/ImageProcessing/obj/x86/Debug/ImageProcessing.csproj.FileListAbsolute.txt
	ImageProcessing/ImageProcessing/obj/x86/Debug/ImageProcessing.exe
	ImageProcessing/ImageProcessing/obj/x86/Debug/ImageProcessing.pdb