hopefully working
Merge remote-tracking branch 'origin/master'

Conflicts:
	SL136/WebApi136/Web.config
	SL136/WebApi136/bin/WebApi136.dll
	SL136/WebApi136/bin/WebApi136.dll.config
	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
	web136/web136/Views/Shared/SharedAnnouncement.cshtml
	web136/web136/obj/Debug/web136.csprojResolveAssemblyReference.cache