update and merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Signum.Engine.Extensions/Chart/ChartLogic.cs
	Signum.Engine.Extensions/Dashboard/DashboardLogic.cs
	Signum.Engine.Extensions/UserQueries/UserQueryLogic.cs
	Signum.Web.Extensions/Isolation/IsolationWidgetHelper.cs