Got the macro dialog working with previously selected macros in the rte and pre-fills the data that was previously there.
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
umb photo folder directive
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0
Adds folder icons to the photo folder directive
Media delete dialog, missing D attr validation
Fixes broken table drag n drop