marc edit
ascasc
Merge branch 'master' of https://github.com/hzhiguang/AbuseAnalysis

Conflicts:
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/bin/Debug/FYP_ChildAbuseGIS2013.ServiceInterface.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/bin/Debug/FYP_ChildAbuseGIS2013.ServiceInterface.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/obj/Debug/FYP_ChildAbuseGIS2013.ServiceInterface.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/obj/Debug/FYP_ChildAbuseGIS2013.ServiceInterface.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.ServiceInterface/obj/Debug/ResolveAssemblyReference.cache
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.SkinDetection/bin/Debug/FYP_ChildAbuseGIS2013.SkinDetection.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.SkinDetection/bin/Debug/FYP_ChildAbuseGIS2013.SkinDetection.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.SkinDetection/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.SkinDetection/obj/x86/Debug/FYP_ChildAbuseGIS2013.SkinDetection.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.SkinDetection/obj/x86/Debug/FYP_ChildAbuseGIS2013.SkinDetection.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.suo
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013.csproj
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.ServiceInterface.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.ServiceInterface.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.SkinDetection.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.SkinDetection.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/bin/FYP_ChildAbuseGIS2013.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/obj/Debug/FYP_ChildAbuseGIS2013.dll
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/obj/Debug/FYP_ChildAbuseGIS2013.pdb
	FYP_ChildAbuseGIS2013/FYP_ChildAbuseGIS2013/obj/Debug/ResolveAssemblyReference.cache