Macros - bugfix parameters
Core.Resolution - fix concurrency issues

Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
Core.Resolution - umbraco.cms.Action should NOT reset resolution
Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once
Core.StringExtensions - switch over to the new DefaultShortStringHelper
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
Wrap all ViewEngines in a profiler

Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
Make sure the profilingengine doesn't wrap itself
child action icon alignment tweak
Permissions dialog polish
rollback dialog polish
Progressbart convert to css3 from gif
Initial commit of rte prevalue editor
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Merge pull request #146 from mortenbock/6.2.0

Custom ProfilingViewEngine
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Conflicts:
	src/Umbraco.Web/WebBootManager.cs
Gets view paths to load in dynamically based on whether a core or plugin tree is rendering, this allows us to store view files based on conventions for packages. Completes: U4-2849 Ensure editor views, etc... can exist outside of the /umbraco folder for package devs
Added docs on creating trees and view path location conventions.
Explicitly adds automapper to the UI proj so we don't get that strange YSOD that says it's not there sometimes.
Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)