Fix to properly read actions from trees.config.
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.1.3-clean
Cosmetic changes discovered during testing today
merge
Merge pull request #175 from diachedelic/7.0.0

Encoded API query string & removed refs to umbraco.aspx
Removes contour files that were committed by accident
removes contour committed app config
Completes: U4-3020 Installning package with legacy data types just gives error
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Core.TypeExtensions - add methods
Web.Mvc - Refactor UmbracoViewPage, UmbracoTemplatePage, support strongly-typed content

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
Readds datatype editor killed in merge
Adds contentype alias to media and cotnent tree nodes
merged
Merge pull request #173 from pynej/trees-config-action

Trees config action
Fixes packaging service to export data type's property with the ID as the property editor ID
Fixes packaging service up to export data type's properly, fixes legacy DataTypeDefinition to export data type's properly with the prop ed alias instead of id, obsoletes old content extension methods.
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web/Mvc/UmbracoViewPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
PublishedContent - remove useles code in model factory
Standalone - fix so it works again