Merge branch 'TypeScriptToolsVersion'

Conflicts:
	Signum.Web/Signum.Web.csproj
	Signum.Web/Signum/Scripts/SF_FindNavigator.js
Merge branch 'sp'

Conflicts:
	Signum.Web/Signum.Web.csproj
	Signum.Web/Signum/Scripts/SF_FindNavigator.js
Merge branch 'master' of https://github.com/signumsoftware/framework