Revert "Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828)"

Revert "We need to create the template from it's alias, which is the safeAlias, which is the correct filename"
This reverts commit 9663cfde82 and commit 11aea0f515

src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js

@@ -46,7 +46,7 @@ function entityResource($q, $http, umbRequestHelper) {
                $http.get(
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
-                        "GetSafeAlias", { value: encodeURIComponent(value), camelCase: camelCase })),
+                       "GetSafeAlias", { value: value, camelCase: camelCase })),
                'Failed to retrieve content type scaffold');
         },
 

src/Umbraco.Web/Editors/TemplateController.cs

@@ -184,7 +184,7 @@ namespace Umbraco.Web.Editors
                         throw new HttpResponseException(HttpStatusCode.NotFound);
                 }
 
-                var template = Services.FileService.CreateTemplateWithIdentity(display.Alias, display.Content, master);
+                var template = Services.FileService.CreateTemplateWithIdentity(display.Name, display.Content, master);
                 Mapper.Map(template, display);
             }