merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	SL136/BL/bin/Debug/136Service.dll
	SL136/BL/bin/Debug/136Service.pdb
	SL136/BL/obj/Debug/136Service.dll
	SL136/BL/obj/Debug/136Service.pdb
	SL136/BL/obj/Debug/Service.csprojResolveAssemblyReference.cache
	SL136/DAL/bin/Debug/136Repository.dll
	SL136/DAL/bin/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/136Repository.dll
	SL136/DAL/obj/Debug/136Repository.pdb
	SL136/DAL/obj/Debug/Repository.csprojResolveAssemblyReference.cache
	SL136/SL136.v12.suo
	SL136/WebApi136/bin/136Repository.dll
	SL136/WebApi136/bin/136Repository.pdb
	SL136/WebApi136/bin/136Service.dll
	SL136/WebApi136/bin/136Service.pdb
	SL136/WebApi136/bin/WebApi136.dll
	SL136/WebApi136/bin/WebApi136.pdb

	SL136/WebApi136/obj/Debug/WebApi136.csprojResolveAssemblyReference.cache
	SL136/WebApi136/obj/Debug/WebApi136.dll
	SL136/WebApi136/obj/Debug/WebApi136.pdb
	web136/web136.v12.suo