merge
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	Bussiness/bin/Release/GZ.Bussiness.dll
	Bussiness/bin/Release/GZ.Bussiness.pdb
	Bussiness/bin/Release/GZ.Config.dll
	Bussiness/bin/Release/GZ.Config.pdb
	Bussiness/bin/Release/GZ.DataAccess.dll
	Bussiness/bin/Release/GZ.DataAccess.pdb
	Bussiness/bin/Release/GZ.Model.dll
	Bussiness/bin/Release/GZ.Model.pdb
	Bussiness/obj/Release/Bussiness.csprojResolveAssemblyReference.cache
	Bussiness/obj/Release/GZ.Bussiness.dll
	Bussiness/obj/Release/GZ.Bussiness.pdb
	Config/bin/Release/GZ.Config.dll
	Config/bin/Release/GZ.Config.pdb
	Config/obj/Release/GZ.Config.dll
	Config/obj/Release/GZ.Config.pdb
	DataAccess/bin/Release/GZ.DataAccess.dll
	DataAccess/bin/Release/GZ.DataAccess.pdb
	DataAccess/bin/Release/GZ.Model.dll
	DataAccess/bin/Release/GZ.Model.pdb
	DataAccess/obj/Release/DataAccess.csprojResolveAssemblyReference.cache
	DataAccess/obj/Release/GZ.DataAccess.dll
	DataAccess/obj/Release/GZ.DataAccess.pdb
	GZService.v11.suo
	Model/bin/Release/GZ.Model.dll
	Model/bin/Release/GZ.Model.pdb
	Model/obj/Release/GZ.Model.dll
	Model/obj/Release/GZ.Model.pdb
	RestServer/obj/Release/GZ.RestServer.dll
	RestServer/obj/Release/GZ.RestServer.pdb
	RestServer/obj/Release/RestServer.csprojResolveAssemblyReference.cache