U4-663, U-667

Fix for http://issues.umbraco.org/issue/U4-663, so Umbraco does not overwrite existing template files.
Fix for http://issues.umbraco.org/issue/U4-667, so the checkbox for render macro in editor is dependent on the checkbox for use in editor.