putting back what the UmbLoginController should be ... where in the hell has this been overwritten from??!
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
Completes: U4-4227 Rename default member property aliases
Ensures the built-in member controllers have the correct logic - somehow got reverted and then not merged.
Also clean up v6 snippets
fixed an issue with setting password with legacy api
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
fixes build issue
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0