SERVER
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer

Conflicts:
	SnitchApplicationServer.v11.suo
	SnitchApplicationServer/obj/Debug/Package/PackageTmp/bin/SnitchApplicationServer.dll
	SnitchApplicationServer/obj/Debug/Package/PackageTmp/bin/SnitchApplicationServer.pdb
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.csprojResolveAssemblyReference.cache