Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image
Merge branch '7.0.1' into 7.0.2
Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time.
Fixes installation issue with rebuilding media cache

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web/Umbraco.Web.csproj
Merge branch '6.2.0-membershipprovider' into 6.2.0

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
U4-3710, -3732 - Fix default ShortStringHelper
Merge remote-tracking branch 'origin/7.0.1' into 7.0.2
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
Fixes links in help
Merge pull request #269 from hartvig/7.0.1

Fixes links in help
Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2
getting membership provider to the same state as v7
Worked on the application cache, added request cache, changed some stuff over to be interfaces, added unit tests suite (need mroe) to test all caching providers.

Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
Backporting the cachehelper and associated cache classes.
removes the xquery tests - we don't need these and r# keeps wanting to run them
proj file
fixes up unit tests
Fixes up webbootmanager with new cachehelper updates.
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
backported IContentService updates