D'oh .. now properly renamed, in the csproj as well - U4-4046 Rename "empty template" to "empty"
Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2
Fix for U4-3831.  Removes form, adds ng-click with $event.preventDefault() to prevent premature saving.
U4-4045 The "Empty" partial view snippet should have @inherits
fixes the protect page logic
Reverts GetByQuery and MNTP Xpath query WIP - is contained only in 7.1
Revert "WIP: adds cropper directive"

This reverts commit c5a7eab1d5496be7090a5bb686bc0a2f069992a6.
new cropper is only contained in 7.1 branch
Revert "adds editing function to media picker controller"

This reverts commit 7d051dffbb1b891979cb4e1d698e5f536661d691.
This will only be contained in 7.1
Re-adds all updates for the WIP for xpath/css filtering and the cropper.
Adds comments to EntityController code to use UmbracoHelper
Rename umbImageCrop.directive.js to umbimagecrop.directive.js

changed file name to be consistent with the rest of our file names
Rename umbImageGravity.directive.js to umbimagegravity.directive.js

Changed file name to be consistent with the rest of our file names
Fixes: U4-4010 Member and user session gets mixed - fixes how we detect a back office request + unit tests and added new IsBackOffice attribute
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
	src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
ensures webapi plugincontrollers are routed to /backoffice if [IsBackOffice] is specified
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
ensures auth controller has IsBackOffice specified
Allows DefaultPropertyValueConverters to shadow other default converters, this allows us to have a hierarchy of default converters. This also fixes part of this issue: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong
Fixes: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong
Merge pull request #285 from mrdrbob/U4-3831

Fix for U4-3831.