..

..
Merge remote-tracking branch 'origin/master'

Conflicts:
	imageupload/bin/Newtonsoft.Json.dll
	imageupload/bin/Newtonsoft.Json.xml
	imageupload/bin/imageupload.dll
	imageupload/bin/imageupload.pdb
	imageupload/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	imageupload/obj/Debug/imageupload.csproj.FileListAbsolute.txt
	imageupload/obj/Debug/imageupload.csprojResolveAssemblyReference.cache
	imageupload/obj/Debug/imageupload.dll
	imageupload/obj/Debug/imageupload.pdb