Merge commit 'd24b5d25b8cda5c05fb08b811f72225f6966a8ab' into TS1

Conflicts:
	Signum.Web/Signum.Web.csproj
Merge commit '8bf12804e716a84f90386dbc174bb31fcc5f8b35' into TS1
Merge branch 'TS1'

Conflicts:
	Signum.Web/Signum.Web.csproj