test
aa
Merge branch 'master' of https://github.com/Medyanet/AdServer

Conflicts:
	AdServer.Core/bin/Debug/AdServer.Core.dll
	AdServer.Core/bin/Debug/AdServer.Core.pdb
	AdServer.Core/obj/Debug/AdServer.Core.csprojResolveAssemblyReference.cache
	AdServer.Core/obj/Debug/AdServer.Core.dll
	AdServer.Core/obj/Debug/AdServer.Core.pdb
	AdServer.Data/bin/Debug/AdServer.Data.dll
	AdServer.Data/bin/Debug/AdServer.Data.pdb
	AdServer.Data/obj/Debug/AdServer.Data.csprojResolveAssemblyReference.cache
	AdServer.Data/obj/Debug/AdServer.Data.dll
	AdServer.Data/obj/Debug/AdServer.Data.pdb
	AdServer.Report/bin/AdServer.Core.dll
	AdServer.Report/bin/AdServer.Core.pdb
	AdServer.Report/bin/AdServer.Report.dll
	AdServer.Report/bin/AdServer.Report.pdb
	AdServer.Report/obj/Debug/AdServer.Report.csprojResolveAssemblyReference.cache
	AdServer.Report/obj/Debug/AdServer.Report.dll
	AdServer.Report/obj/Debug/AdServer.Report.pdb
	AdServer.v12.suo
Merge branch 'master' of https://github.com/Medyanet/AdServer
change
Merge branch 'master' of https://github.com/Medyanet/AdServer

Conflicts:
	AdServer.v12.suo
Cookie made it.