Merge remote-tracking branch 'origin/sp'

Conflicts:
	Signum.Web.Extensions/Signum.Web.Extensions.csproj
Merge branch 'TS1'

Conflicts:
	Signum.Web.Extensions/Signum.Web.Extensions.csproj