Created a json converter so we don't have to use DarkMagic - this is based on a new "JSON" value type that is applied to a property editor.
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0