Fixed type in Step 4 install wizard - U4-3556.
Merge pull request #554 from cloud46limited/umbUKFest-3556

Fixed type in Step 4 install wizard - U4-3556.
Merge remote-tracking branch 'origin/6.2.2' into 6.2.4
Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon

#U4-5728
Moved the right click action for the tree header

See http://issues.umbraco.org/issue/U4-5961
The only way i could get this project to build and run was to change the transform to explicitly target 4.0.0.1 for mvc and webapi, otherwise nothing works and horribly cryptic build errors. Added the tests for the BackgroundTaskRunner
working on U4-5964, U4-5907, U4-5965
updates error msgs when sending requests to the same server pointing to docs on baseUrl
Merge remote-tracking branch 'origin/6.2.5' into 7.2.1

Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
Fixes merge issues
reverts change to umbraco module to set the original URL when using SSL... there should be no need to specify anything differently here. If there's an explicity base path and url then use the basePath config option.
Fix for issue U4-5364 without trying to fix the localization of the error text.
U4-5101: Localize Related Link property editor
U4-5101: Localize Tags property editor
U4-5101: Localize Content Picker property editor
U4-5101: Localize Image Cropper property editor
U4-5101: Localize Grid property editor
Update translations for Grid
U4-5973 Fix casing of word XSLT when saving a XSLT file
Merge pull request #581 from readingdancer/Fix_for_5364_Second_Version

Fix for issue U4-5364 without trying to fix the localization of error msg.