Update Umbraco to 7.12.2

2018-09-16 15:08:47 -04:00
parent 7ed7776432
commit 616ab81bad
764 changed files with 142781 additions and 66784 deletions
@@ -0,0 +1,493 @@
+[
+    {
+        "name": "Introduction",
+        "alias": "umbIntroIntroduction",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "allowDisable": true,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "Welcome to Umbraco - The Friendly CMS",
+                "content": "<p>Thank you for choosing Umbraco - we think this could be the beginning of something beautiful. While it may feel overwhelming at first, we've done a lot to make the learning curve as smooth and fast as possible.</p><p>In this quick tour we will introduce you to the main areas of Umbraco and show you how to best get started.</p><p><em>If you don't want to take the tour now you can always start it by opening the Help drawer in the bottom left corner.<em></p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications",
+                "elementPreventClick": true,
+                "title": "Main Menu",
+                "content": "This is the main menu in Umbraco backoffice. Here you can navigate between the different sections, see your user profile and open the help drawer.",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "[data-element='section-content']",
+                "elementPreventClick": true,
+                "title": "Sections",
+                "content": "Each area in Umbraco is called a <b>Section</b>. Right now you are in the Content section, when you want to go to another section simply click on the appropriate icon in the main menu and you'll be there in no time.",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "#tree",
+                "elementPreventClick": true,
+                "title": "The Tree",
+                "content": "<p>This is the <b>Tree</b> and it is the main navigation inside a section.</p><p>In the Content section the tree is called the <b>Content tree</b> and here you can navigate the content of your website.</p>"
+            },
+            {
+                "element": "[data-element='editor-container']",
+                "elementPreventClick": true,
+                "title": "Dashboards",
+                "content": "<p>A dashboard is the main view you are presented with when entering a section within the backoffice, and can be used to show valuable information to the users of the system.</p><p>Notice that some sections have multiple dashboards.</p>"
+            },
+            {
+                "element": "[data-element='global-search-field']",
+                "title": "Search",
+                "content": "The search allows you to quickly find whatever you're looking for across sections within Umbraco."
+            },
+            {
+                "element": "#applications [data-element='section-user']",
+                "title": "User profile",
+                "content": "Now click on your <b>user avatar</b> to open the user profile dialog.",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "[data-element~='overlay-user']",
+                "elementPreventClick": true,
+                "title": "User profile",
+                "content": "<p>Here you can see details about your user, what Umbraco version the site is running, change your password and log out of Umbraco.</p><p>In the <b>User section</b> you will be able to do more advanced user management.</p>"
+            },
+            {
+                "element": "[data-element~='overlay-user'] [data-element='button-overlayClose']",
+                "title": "User profile",
+                "content": "Let's close the user profile again.",
+                "event": "click"
+            },
+            {
+                "element": "#applications [data-element='section-help']",
+                "title": "Help",
+                "content": "If you ever find yourself in trouble click here to open the Help drawer.",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "[data-element='drawer']",
+                "elementPreventClick": true,
+                "title": "Help",
+                "content": "<p>In the help drawer you will find articles and videos related to the section you are using.</p><p>This is also where you will find the next tour on how to get started with Umbraco.</p>",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "[data-element='drawer'] [data-element='help-tours']",
+                "title": "Tours",
+                "content": "To continue your journey on getting started with Umbraco, you can find more tours right here."
+            }
+        ]
+    },
+    {
+        "name": "Create document type",
+        "alias": "umbIntroCreateDocType",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "Create your first Document Type",
+                "content": "<p>Step 1 of any site is to create a <strong>Document Type</strong>.<br> A Document Type is a template for content. For each <em>type</em> of content you want to create you'll create a Document Type. This will define where content based on this Document Type can be created, how many properties it holds and what the input method should be for these properties.</p><p>When you have at least one Document Type in place you can start creating content and this content can then be used in a template.</p><p>In this tour you will learn how to set up a basic Document Type with a property to enter a short text.</p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications [data-element='section-settings']",
+                "title": "Navigate to the Settings sections",
+                "content": "In the <b>Settings section</b> you can create and manage Document types.",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "#tree [data-element='tree-item-documentTypes']",
+                "title": "Create Document Type",
+                "content": "<p>Hover over the Document Type tree and click the <b>three small dots</b> to open the <b>context menu</b>.</p>",
+                "event": "click",
+                "eventElement": "#tree [data-element='tree-item-documentTypes'] [data-element='tree-item-options']"
+            },
+            {
+                "element": "#dialog [data-element='action-documentType']",
+                "title": "Create Document Type",
+                "content": "<p>Click <b>Document Type</b> to create a new document type with a template. The template will be automatically created and set as the default template for this Document Type.</p><p>You will use the template in a later tour to render content.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-name-field']",
+                "title": "Enter a name",
+                "content": "<p>Your Document Type needs a name. Enter <code>Home Page</code> in the field and click <b>Next</b>.",
+                "view": "doctypename"
+            },
+            {
+                "element": "[data-element='editor-description']",
+                "title": "Enter a description",
+                "content": "<p>A description helps to pick the right document type when creating content.</p><p>Write a description for our Home page. It could be: <br/><pre>The home page of the website</pre></p>"
+            },
+            {
+                "element": "[data-element='group-add']",
+                "title": "Add tab",
+                "content": "Tabs are used to organize properties on content in the Content section. Click <b>Add new tab</b> to add a tab.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='group-name-field']",
+                "title": "Name the tab",
+                "content": "<p>Enter <code>Home</code> in the tab name.</p><p><em>You can name a tab anything you want and if you have a lot of properties it can be useful to add multiple tabs.</em></p>",
+                "view": "tabName"
+            },
+            {
+                "element": "[data-element='property-add']",
+                "title": "Add a property",
+                "content": "<p>Properties are the different input fields on a content page.</p><p>On our Home Page we want to add a welcome text.</p><p>Click <b>Add property</b> to open the property dialog.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='overlay-property-settings'] [data-element='property-name']",
+                "title": "Name the property",
+                "content": "Enter <code>Welcome Text</code> as the name for the property.",
+                "view": "propertyname"
+            },
+            {
+                "element": "[data-element~='overlay-property-settings'] [data-element='property-description']",
+                "title": "Enter a description",
+                "content": "<p>A description will help your editor fill in the right content.</p><p>Enter a description for the property editor. It could be:<br/> <pre>Write a nice introduction text so the visitors feel welcome</pre></p>"
+            },
+            {
+                "element": "[data-element~='overlay-property-settings'] [data-element='editor-add']",
+                "title": "Add editor",
+                "content": "When you add an editor you choose what the input method for this property will be. Click <b>Add editor</b> to open the editor picker dialog.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='overlay-editor-picker']",
+                "elementPreventClick": true,
+                "title": "Editor picker",
+                "content": "<p>In the editor picker dialog we can pick one of the many built-in editors.</p><p><em>You can choose from preconfigured data types (Reuse) or create a new configuration (Available editors)</em>.</p>"
+            },
+            {
+                "element": "[data-element~='overlay-editor-picker'] [data-element='editor-Textarea']",
+                "title": "Select editor",
+                "content": "Select the <b>Textarea</b> editor. This will add a textarea to the Welcome Text property.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='overlay-editor-settings']",
+                "elementPreventClick": true,
+                "title": "Editor settings",
+                "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed."
+            },
+            {
+                "element": "[data-element~='overlay-editor-settings'] [data-element='button-overlaySubmit']",
+                "title": "Save editor",
+                "content": "Click <b>Submit</b> to save the changes.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='overlay-property-settings'] [data-element='button-overlaySubmit']",
+                "title": "Add property to document type",
+                "content": "Click <b>Submit</b> to add the property to the document type.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='sub-view-permissions']",
+                "title": "Check the document type permissions",
+                "content": "Click <b>Permissions</b> to view the permissions page.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='permissions-allow-as-root']",
+                "title": "Allow this document type to work at the root of your site",
+                "content": "Toggle the switch <b>Allow as root</b> to allow new content pages based on this document type to be created at the root of your site",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='button-save']",
+                "title": "Save the document type",
+                "content": "All we need now is to save the document type. Click <b>Save</b> to create and save your new document type.",
+                "event": "click"
+            }
+        ]
+    },
+    {
+        "name": "Create Content",
+        "alias": "umbIntroCreateContent",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "Creating your first content node",
+                "content": "<p>In this tour you will learn how to create the home page for your website. It will use the <b>Home Page</b> Document type you created in the previous tour.</p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications [data-element='section-content']",
+                "title": "Navigate to the Content section",
+                "content": "<p>In the <b>Content section</b> you can create and manage the content of the website.</p><p>The <b>Content section</b> contains the content of your website. Content is displayed as <b>nodes</b> in the content tree.</p>",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "[data-element='tree-root']",
+                "title": "Open context menu",
+                "content": "<p>Open the context menu by hovering over the root of the content section.</p><p>Now click the <b>three small dots</b> to the right.</p>",
+                "event": "click",
+                "eventElement": "#tree [data-element='tree-root'] [data-element='tree-item-options']"
+            },
+            {
+                "element": "[data-element='action-create-homePage']",
+                "title": "Create Home page",
+                "content": "<p>The context menu shows you all the actions that are available on a node</p><p>Click on <b>Home Page</b> to create a new page of type <b>Home Page</b>.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-content'] [data-element='editor-name-field']",
+                "title": "Give your new page a name",
+                "content": "<p>Our new page needs a name. Enter <code>Home</code> in the field and click <b>Next</b>.</p>",
+                "view": "nodename"
+            },
+            {
+                "element": "[data-element='editor-content'] [data-element='property-welcomeText']",
+                "title": "Add a welcome text",
+                "content": "<p>Add content to the <b>Welcome Text</b> field.</p><p>If you don't have any ideas here is a start:<br/> <pre>I am learning Umbraco. High Five I Rock #H5IR</pre>.</p>"
+            },
+            {
+                "element": "[data-element='editor-content'] [data-element='button-saveAndPublish']",
+                "title": "Save and Publish",
+                "content": "<p>Now click the <b>Save and publish</b> button to save and publish your changes.</p>",
+                "event": "click"
+            }
+        ]
+    },
+    {
+        "name": "Render in template",
+        "alias": "umbIntroRenderInTemplate",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "Render your content in a template",
+                "content": "<p>Templating in Umbraco builds on the concept of <b>Razor Views</b> from ASP.NET MVC. This tour is a sneak peak on how to write templates in Umbraco.</p><p>In this tour you will learn how to render content from the <b>Home Page</b> document type so you can see the content added to our <b>Home</b> content page.</p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications [data-element='section-settings']",
+                "title": "Navigate to the Settings section",
+                "content": "<p>In the <b>Settings</b> section you will find all the templates.</p><p>It is of course also possible to edit all your code files in your favorite code editor.</p>",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "#tree [data-element='tree-item-templates']",
+                "title": "Expand the Templates node",
+                "content": "<p>To see all our templates click the <b>small triangle</b> to the left of the templates node.</p>",
+                "event": "click",
+                "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-expand']",
+                "view": "templatetree"
+            },
+            {
+                "element": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page']",
+                "title": "Open Home template",
+                "content": "<p>Click the <b>Home Page</b> template to open and edit it.</p>",
+                "eventElement": "#tree [data-element='tree-item-templates'] [data-element='tree-item-Home Page'] a.umb-tree-item__label",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-templates'] [data-element='code-editor']",
+                "title": "Edit template",
+                "content": "<p>The template can be edited here or in your favorite code editor.</p><p>To render the field from the document type add the following to the template:<br/> <pre>&#60;h1&#62;@Model.Content.Name&#60;/h1&#62;<br>&#60;p&#62;@Model.Content.WelcomeText&#60;/p&#62;</pre></p>"
+            },
+            {
+                "element": "[data-element='editor-templates'] [data-element='button-save']",
+                "title": "Save the template",
+                "content": "Click the <b>Save button</b> and your template will be saved.",
+                "event": "click"
+            }
+        ]
+    },
+    {
+        "name": "View Home page",
+        "alias": "umbIntroViewHomePage",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "View your Umbraco site",
+                "content": "<p>Our three main components for a page are done: <b>Document type, Template, and Content</b>. It is now time to see the result.</p><p>In this tour you will learn how to see your published website.</p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications [data-element='section-content']",
+                "title": "Navigate to the content sections",
+                "content": "In the <b>Content section</b> you will find the content of our website.",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "#tree [data-element='tree-item-Home']",
+                "title": "Open the Home page",
+                "content": "<p>Click the <b>Home</b> page to open it.</p>",
+                "event": "click",
+                "eventElement": "#tree [data-element='tree-item-Home'] a.umb-tree-item__label"
+            },
+            {
+                "element": "[data-element='editor-content'] [data-element='tab-_umb_infoTab']",
+                "title": "Info",
+                "content": "<p>Under the info tab you will find the default information about a content item.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-content'] [data-element='node-info-urls']",
+                "title": "Open page",
+                "content": "<p>Click the <b>Link to document</b> <i class='icon-out'></i> to view your page.</p><p>Tip: Click the preview button in the bottom right corner to preview changes without publishing them.</p>",
+                "event": "click",
+                "eventElement": "[data-element='editor-content'] [data-element='node-info-urls'] a[target='_blank']"
+            }
+        ]
+    },
+    {
+        "name": "The Media library",
+        "alias": "umbIntroMediaSection",
+        "group": "Getting Started",
+        "groupOrder": 100,
+        "requiredSections": [
+            "content",
+            "media",
+            "settings",
+            "developer",
+            "users",
+            "member",
+            "forms"
+        ],
+        "steps": [
+            {
+                "title": "How to use the media library",
+                "content": "<p>A website would be boring without media content. In Umbraco you can manage all your images, documents, videos etc. in the <b>Media section</b>. Here you can upload and organise your media items and see details about each item.</p><p>In this tour you will learn how to upload and organise your Media library in Umbraco. It will also show you how to view details about a specific media item.</p>",
+                "type": "intro"
+            },
+            {
+                "element": "#applications [data-element='section-media']",
+                "title": "Navigate to the Media section",
+                "content": "The <b>media</b> section is where you manage all your media items.",
+                "event": "click",
+                "backdropOpacity": 0.6
+            },
+            {
+                "element": "#tree [data-element='tree-root']",
+                "title": "Create a new folder",
+                "content": "<p>First create a folder for your images. Hover over the media root node and click the <b>three small dots</b> on the right side of the item.</p>",
+                "event": "click",
+                "eventElement": "#tree [data-element='tree-root'] [data-element='tree-item-options']"
+            },
+            {
+                "element": "#dialog [data-element='action-Folder']",
+                "title": "Create a new folder",
+                "content": "<p>Select the <b>Folder</b> option to select the type folder.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='editor-name-field']",
+                "title": "Enter a name",
+                "content": "<p>Enter <code>My Images</code> in the field.</p>",
+                "view": "foldername"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='button-save']",
+                "title": "Save the folder",
+                "content": "<p>Click the <b>Save</b> button to create the new folder.</p>",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='dropzone']",
+                "title": "Upload images",
+                "content": "<p>In the upload area you can upload your media items.</p><p>Click the <b>Click here to choose files</b> button and select a couple of images on your computer and upload them.</p>",
+                "view": "uploadimages"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='media-grid-item-0']",
+                "title": "View media item details",
+                "content": "Hover over the media item and <b>Click the purple bar</b> to view details about the media item.",
+                "event": "click",
+                "eventElement": "[data-element='editor-media'] [data-element='media-grid-item-0'] [data-element='media-grid-item-edit']"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='property-umbracoFile']",
+                "elementPreventClick": true,
+                "title": "The uploaded image",
+                "content": "<p>Here you can see the image you have uploaded.</p>"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='property-umbracoBytes']",
+                "title": "Image size",
+                "content": "<p>You will also find other details about the image, like the size.</p><p>Media items work in much the same way as content. So you can add extra properties to an image by creating or editing the <b>Media types</b> in the Settings section.</p>"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='tab-_umb_infoTab']",
+                "title": "Info",
+                "content": "Like the content section you can also find default information about the media item. You will find these under the info tab.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='node-info-urls']",
+                "title": "Link to media",
+                "content": "The path to the media item..."
+            },
+            {
+                "element": "[data-element='editor-media'] [data-element='node-info-update-date']",
+                "title": "Last edited",
+                "content": "...and information about when the media item has been created and edited."
+            },
+            {
+                "element": "[data-element='editor-container']",
+                "elementPreventClick": true,
+                "title": "Using media items",
+                "content": "You can reference a media item directly in a template by using the path or try adding a Media Picker to a document type property so you can select media items from the content section."
+            }
+        ]
+    }
+]
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1978073806" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
+<clientDependency version="1550335859" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">

  <!-- 
    This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
@@ -26,37 +26,45 @@
    <apiEndpoint><![CDATA[http://embed.gettyimages.com/oembed]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- Poll Everywhere Settigs -->
+  <!-- Poll Everywhere Settings -->
  <provider name="PollEverywhere" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
    <urlShemeRegex><![CDATA[polleverywhere\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://www.polleverywhere.com/services/oembed/]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- Poll Daddy Settigs -->
+  <!-- Poll Daddy Settings -->
  <provider name="PollDaddy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
    <urlShemeRegex><![CDATA[polldaddy\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://polldaddy.com/oembed/]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- IFTTT Settigs -->
+  <!-- IFTTT Settings -->
  <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
    <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- Instagram Settigs -->
+  <!-- Instagram Settings -->
  <provider name="Instagram" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
    <urlShemeRegex><![CDATA[instagram\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://api.instagram.com/oembed]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- Rdio Settigs -->
+  <!-- Issuu Settings-->
+  <provider name="Issuu" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[issuu.com/(?:.*)/docs]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[https://issuu.com/oembed]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
+        <param name="format">json</param>
+    </requestParams>
+  </provider>
+  <!-- Rdio Settings -->
  <provider name="Rdio" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
    <urlShemeRegex><![CDATA[rdio\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://www.rdio.com/api/oembed/]]></apiEndpoint>
    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
  </provider>
-  <!-- SoundCloud Settigs -->
+  <!-- SoundCloud Settings -->
  <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, umbraco">
    <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
    <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
@@ -116,4 +124,11 @@
  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, umbraco">
    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
  </provider>
+  <!-- Twitter Settigs -->
+  <provider name="Twitter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[twitter\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[https://publish.twitter.com/oembed]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco">
+    </requestParams>
+  </provider>
 </embed>
@@ -8,10 +8,10 @@ More information and documentation can be found on GitHub: https://github.com/Sh
 -->
 <ExamineLuceneIndexSets>
  <!-- The internal index set used by Umbraco back-office - DO NOT REMOVE -->
-  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/Internal/"/>
+  <IndexSet SetName="InternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/Internal/"/>

  <!-- The internal index set used by Umbraco back-office for indexing members - DO NOT REMOVE -->
-  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/InternalMember/">
+  <IndexSet SetName="InternalMemberIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/InternalMember/">
    <IndexAttributeFields>
      <add Name="id" />
      <add Name="nodeName"/>
@@ -24,5 +24,5 @@ More information and documentation can be found on GitHub: https://github.com/Sh
  </IndexSet>
    
  <!-- Default Indexset for external searches, this indexes all fields on all types of nodes-->
-  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/{machinename}/External/" />
+  <IndexSet SetName="ExternalIndexSet" IndexPath="~/App_Data/TEMP/ExamineIndexes/External/" />
 </ExamineLuceneIndexSets>
@@ -0,0 +1,28 @@
+<?xml version ="1.0" encoding="utf-8" ?>
+<!--
+Please note: to use healthcheck notifications you must ensure to set the umbracoApplicationUrl value
+in umbracoSettings.config.  For more information on this setting, please see:
+https://our.umbraco.com/documentation/reference/config/umbracosettings/#web-routing
+
+For details on the format of this configuration file see:
+https://our.umbraco.com/documentation/reference/config/healthchecks
+-->
+<HealthChecks>
+  <disabledChecks>
+    <!--<check id="1B5D221B-CE99-4193-97CB-5F3261EC73DF" disabledOn="" disabledBy="0" />-->
+  </disabledChecks>
+  <notificationSettings enabled="false" firstRunTime="" periodInHours="24">
+    <notificationMethods>
+      <!--<notificationMethod alias="email" enabled="true" verbosity="Summary" failureOnly="true">
+        <settings>
+          <add key="recipientEmail" value="" />
+        </settings>
+      </notificationMethod>-->
+    </notificationMethods>
+    <disabledChecks>
+      <!--<check id="EB66BB3B-1BCD-4314-9531-9DA2C1D6D9A7" disabledOn="" disabledBy="0" />-->
+    </disabledChecks>
+  </notificationSettings>
+</HealthChecks>
+
+
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<urlrewritingnet xmlns="http://www.urlrewriting.net/schemas/config/2006/07">
-  <rewrites>
-    <!-- 
-		URLRewriting.net is obsolete and will be removed from Umbraco in the future.
-		If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite
-		The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive.
-	-->
-  </rewrites>
-</urlrewritingnet>
@@ -8,4 +8,5 @@
  <allow host="umbraco.org" />
  <allow host="umbraco.tv" />
  <allow host="our.umbraco.org" />
+  <allow host="our.umbraco.com" />
 </feedProxy>
@@ -1,82 +1,27 @@
 [
-	{
-	    "name": "Rich text editor",
-	    "alias": "rte",
-	    "view": "rte",
-	    "icon": "icon-article"
-	},
-	{
-	    "name": "Image",
-	    "alias": "media",
-	    "view": "media",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image wide",
-	    "alias": "media_wide",
-	    "view": "media",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_wide.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image wide cropped",
-	    "alias": "media_wide_cropped",
-	    "view": "media",
-	    "render": "media",
-	    "icon": "icon-picture",
-	    "config": {
-	    	"size": {
-	    		"width": 1920,
-	    		"height": 700
-	    	}
-	    }
-	},
-	{
-	    "name": "Image rounded",
-	    "alias": "media_round",
-	    "view": "media",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_round.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Image w/ text right",
-	    "alias": "media_text_right",
-	    "view": "/App_Plugins/Grid/Editors/Views/media_with_description.html",
-	    "render": "/App_Plugins/Grid/Editors/Render/media_text_right.cshtml",
-	    "icon": "icon-picture"
-	},
-	{
-	    "name": "Macro",
-	    "alias": "macro",
-	    "view": "macro",
-	    "icon": "icon-settings-alt"
-	},
-	{
-	    "name": "Embed",
-	    "alias": "embed",
-	    "view": "embed",
-	    "render": "/App_Plugins/Grid/Editors/Render/embed_videowrapper.cshtml",
-	    "icon": "icon-movie-alt"
-	},
-	{
-        "name": "Banner Headline",
-        "alias": "banner_headline",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 36px; line-height: 45px; font-weight: bold; text-align:center",
-            "markup": "<h1 style='font-size:62px;text-align:center'>#value#</h1>"
-        }
+    {
+        "name": "Rich text editor",
+        "alias": "rte",
+        "view": "rte",
+        "icon": "icon-article"
    },
    {
-        "name": "Banner Tagline",
-        "alias": "banner_tagline",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 25px; line-height: 35px; font-weight: normal; text-align:center",
-            "markup": "<h2 style='font-weight: 100; font-size: 40px;text-align:center'>#value#</h2>"
-        }
+        "name": "Image",
+        "alias": "media",
+        "view": "media",
+        "icon": "icon-picture"
+    },
+    {
+        "name": "Macro",
+        "alias": "macro",
+        "view": "macro",
+        "icon": "icon-settings-alt"
+    },
+    {
+        "name": "Embed",
+        "alias": "embed",
+        "view": "embed",
+        "icon": "icon-movie-alt"
    },
    {
        "name": "Headline",
@@ -89,63 +34,13 @@
        }
    },
    {
-        "name": "Headline centered",
-        "alias": "headline_centered",
+        "name": "Quote",
+        "alias": "quote",
        "view": "textstring",
-        "icon": "icon-coin",
+        "icon": "icon-quote",
        "config": {
-            "style": "font-size: 30px; line-height: 45px; font-weight: bold; text-align:center;",
-            "markup": "<h1 style='text-align:center;'>#value#</h1>"
+            "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px",
+            "markup": "<blockquote>#value#</blockquote>"
        }
-    },
-    {
-        "name": "Abstract",
-        "alias": "abstract",
-        "view": "textstring",
-        "icon": "icon-coin",
-        "config": {
-            "style": "font-size: 16px; line-height: 20px; font-weight: bold;",
-            "markup": "<h3>#value#</h3>"
-        }
-    },
-    {
-        "name": "Paragraph",
-        "alias": "paragraph",
-        "view": "textstring",
-        "icon": "icon-font",
-        "config": {
-            "style": "font-size: 16px; line-height: 20px; font-weight: light;",
-            "markup": "<p>#value#</p>"
-        }
-    },
-	{
-	    "name": "Quote",
-	    "alias": "quote",
-	    "view": "textstring",
-	    "icon": "icon-quote",
-	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
-	        "markup": "<blockquote>#value#</blockquote>"
-	    }
-	},
-	{
-	    "name": "Quote with description",
-	    "alias": "quote_D",
-	    "view": "/App_Plugins/Grid/Editors/Views/quote_with_description.html",
-	    "render": "/App_Plugins/Grid/Editors/Render/quote_with_description.cshtml",
-	    "icon": "icon-quote",
-	    "config": {
-	        "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px"
-	    }
-	},
-	{
-	    "name": "Code",
-	    "alias": "code",
-	    "view": "textstring",
-	    "icon": "icon-code",
-	    "config": {
-	        "style": "overflow: auto;padding: 6px 10px;border: 1px solid #ddd;border-radius: 3px;background-color: #f8f8f8;font-size: .9rem;font-family: 'Courier 10 Pitch', Courier, monospace;line-height: 19px;",
-	        "markup": "<pre>#value#</pre>"
-	    }
-	}
+    }
 ]
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<caching currentCache="DiskCache">
+  <caches>
+    <cache name="DiskCache" type="ImageProcessor.Web.Caching.DiskCache, ImageProcessor.Web" maxDays="365" browserMaxDays="7" trimCache="false">
+      <settings>
+        <setting key="VirtualCachePath" value="~/app_data/cache"/>
+      </settings>
+    </cache>
+  </caches>
+</caching>
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<processing preserveExifMetaData="true" fixGamma="false" interceptAllRequests="false" allowCacheBuster="true">
+  <presets>
+  </presets>
+  <plugins>
+    <plugin name="Alpha" type="ImageProcessor.Web.Processors.Alpha, ImageProcessor.Web"/>
+    <plugin name="AutoRotate" type="ImageProcessor.Web.Processors.AutoRotate, ImageProcessor.Web" enabled="true"/>
+    <plugin name="BackgroundColor" type="ImageProcessor.Web.Processors.BackgroundColor, ImageProcessor.Web" enabled="true"/>
+    <plugin name="Brightness" type="ImageProcessor.Web.Processors.Brightness, ImageProcessor.Web"/>
+    <plugin name="Contrast" type="ImageProcessor.Web.Processors.Contrast, ImageProcessor.Web"/>
+    <plugin name="Crop" type="ImageProcessor.Web.Processors.Crop, ImageProcessor.Web" enabled="true"/>
+    <plugin name="DetectEdges" type="ImageProcessor.Web.Processors.DetectEdges, ImageProcessor.Web"/>
+    <plugin name="EntropyCrop" type="ImageProcessor.Web.Processors.EntropyCrop, ImageProcessor.Web"/>
+    <plugin name="Filter" type="ImageProcessor.Web.Processors.Filter, ImageProcessor.Web"/>
+    <plugin name="Flip" type="ImageProcessor.Web.Processors.Flip, ImageProcessor.Web"/>
+    <plugin name="Format" type="ImageProcessor.Web.Processors.Format, ImageProcessor.Web" enabled="true"/>
+    <plugin name="Gamma" type="ImageProcessor.Web.Processors.Gamma, ImageProcessor.Web"/>
+    <plugin name="GaussianBlur" type="ImageProcessor.Web.Processors.GaussianBlur, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxSize" value="22"/>
+        <setting key="MaxSigma" value="5.1"/>
+        <setting key="MaxThreshold" value="100"/>
+      </settings>
+    </plugin>
+    <plugin name="GaussianSharpen" type="ImageProcessor.Web.Processors.GaussianSharpen, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxSize" value="22"/>
+        <setting key="MaxSigma" value="5.1"/>
+        <setting key="MaxThreshold" value="100"/>
+      </settings>
+    </plugin>
+    <plugin name="Halftone" type="ImageProcessor.Web.Processors.Halftone, ImageProcessor.Web"/>
+    <plugin name="Hue" type="ImageProcessor.Web.Processors.Hue, ImageProcessor.Web"/>
+    <plugin name="Mask" type="ImageProcessor.Web.Processors.Mask, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/mask/"/>
+      </settings>
+    </plugin>
+    <plugin name="Meta" type="ImageProcessor.Web.Processors.Meta, ImageProcessor.Web"/>
+    <plugin name="Overlay" type="ImageProcessor.Web.Processors.Overlay, ImageProcessor.Web">
+      <settings>
+        <setting key="VirtualPath" value="~/images/imageprocessor/overlay/"/>
+      </settings>
+    </plugin>
+    <plugin name="Pixelate" type="ImageProcessor.Web.Processors.Pixelate, ImageProcessor.Web"/>
+    <plugin name="Quality" type="ImageProcessor.Web.Processors.Quality, ImageProcessor.Web" enabled="true"/>
+    <plugin name="ReplaceColor" type="ImageProcessor.Web.Processors.ReplaceColor, ImageProcessor.Web"/>
+    <plugin name="Resize" type="ImageProcessor.Web.Processors.Resize, ImageProcessor.Web" enabled="true">
+      <settings>
+        <setting key="MaxWidth" value="5000"/>
+        <setting key="MaxHeight" value="5000"/>
+      </settings>
+    </plugin>
+    <plugin name="Rotate" type="ImageProcessor.Web.Processors.Rotate, ImageProcessor.Web"/>
+    <plugin name="RotateBounded" type="ImageProcessor.Web.Processors.RotateBounded, ImageProcessor.Web"/>
+    <plugin name="RoundedCorners" type="ImageProcessor.Web.Processors.RoundedCorners, ImageProcessor.Web"/>
+    <plugin name="Saturation" type="ImageProcessor.Web.Processors.Saturation, ImageProcessor.Web"/>
+    <plugin name="Tint" type="ImageProcessor.Web.Processors.Tint, ImageProcessor.Web"/>
+    <plugin name="Vignette" type="ImageProcessor.Web.Processors.Vignette, ImageProcessor.Web"/>
+    <plugin name="Watermark" type="ImageProcessor.Web.Processors.Watermark, ImageProcessor.Web"/>
+  </plugins>
+</processing>
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<security>
+  <services>
+    <service name="LocalFileImageService" type="ImageProcessor.Web.Services.LocalFileImageService, ImageProcessor.Web" />
+    <!--Disable the LocalFileImageService and enable this one when using virtual paths. -->
+    <!--<service name="CloudImageService" type="ImageProcessor.Web.Services.CloudImageService, ImageProcessor.Web">
+      <settings>
+        <setting key="Container" value=""/>
+        <setting key="MaxBytes" value="8194304"/>
+        <setting key="Timeout" value="30000"/>
+        <setting key="Host" value="http://yourhost.com/"/>
+      </settings>
+    </service>-->
+    <service prefix="remote.axd" name="RemoteImageService" type="ImageProcessor.Web.Services.RemoteImageService, ImageProcessor.Web">
+      <settings>
+        <setting key="MaxBytes" value="4194304" />
+        <setting key="Timeout" value="3000" />
+        <setting key="Protocol" value="http" />
+      </settings>
+      <whitelist>
+      </whitelist>
+    </service>
+  </services>
+</security>
@@ -27,7 +27,6 @@
    <command>
      <umbracoAlias>undo</umbracoAlias>
      <name>Undo</name>
-      <name>Remove Format</name>
      <icon>images/editor/undo.gif</icon>
      <tinyMceCommand value="" userInterface="false" frontendCommand="undo">undo</tinyMceCommand>
      <priority>11</priority>
@@ -233,7 +232,6 @@
    <plugin loadOnFrontend="true">code</plugin>
    <plugin loadOnFrontend="true">codemirror</plugin>
    <plugin loadOnFrontend="true">paste</plugin>
-    <plugin loadOnFrontend="true">umbracolink</plugin>
    <plugin loadOnFrontend="true">anchor</plugin>
    <plugin loadOnFrontend="true">charmap</plugin>
    <plugin loadOnFrontend="true">table</plugin>
@@ -241,7 +239,7 @@
    <plugin loadOnFrontend="true">hr</plugin>
  </plugins>
  <validElements>
-    <![CDATA[+a[id|style|rel|data-id|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
+    <![CDATA[+a[id|style|rel|data-id|data-udi|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|
 ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],
 -strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|reversed|start|style|type],-ul[class|style],-li[class|style],br[class],
 img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel|data-id],
@@ -250,7 +248,7 @@ img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|al
 thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],
 -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],
 -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],
-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],
+-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|style|dir|class|align|style],hr[class|style],small[class|style],
 dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang],object[class|id|width|height|codebase|*],
 param[name|value|_value|class],embed[type|width|height|src|class|*],map[name|class],area[shape|coords|href|alt|target|class],bdo[class],button[class],iframe[*]]]>
  </validElements>
@@ -11,27 +11,27 @@
  <!--Settings-->
  <add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
  <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
-  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />  
+  <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTreeController, umbraco" sortOrder="2" />  
  <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
  <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
-  <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
+  <add application="settings" alias="scripts" title="Scripts" type="Umbraco.Web.Trees.ScriptTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
  <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
-  <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
+  <add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
  <add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
+  <add initialize="true" sortOrder="8" alias="contentBlueprints" application="settings" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentBlueprintTreeController, umbraco" />
  
  <!--Developer-->
  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, umbraco" />
  <add initialize="true" sortOrder="1" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
-  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />  
+  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, umbraco" />
  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
-  <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
-  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
+  <add initialize="true" sortOrder="5" alias="xslt" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.XsltTreeController, umbraco" />
+  <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTreeController, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
  
  <!--Users-->
-  <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
-  <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
-  <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+    <add initialize="true" sortOrder="0" alias="users" application="users" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.UserTreeController, umbraco" />
  
+
  <!--Members-->
  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
  <add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
@@ -45,4 +45,4 @@
  <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
       iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
  
-</trees>
+</trees>
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <settings>

  <!-- 
    umbracoSettings.config configuration documentation can be found here: 
-    http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/
+    https://our.umbraco.com/documentation/using-umbraco/config-files/umbracoSettings/
    Many of the optional settings are not explicitly listed here 
    but can be found in the online documentation.
    -->
-  
+
+    <backOffice>
+        <tours enable="false"></tours>
+    </backOffice>
+    
  <content>
    
    <errors>
@@ -36,11 +40,7 @@

    <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
    <PreviewBadge>
-      <![CDATA[<a id="umbracoPreviewBadge" style="position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;z-index: 9999999;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>
-
-    <!-- Cache cycle of Media and Member data fetched from the umbraco.library methods -->
-    <!-- In seconds. 0 will disable cache -->
-    <UmbracoLibraryCacheDuration>1800</UmbracoLibraryCacheDuration>
+      <![CDATA[<a id="umbracoPreviewBadge" style="z-index:99999; position: absolute; top: 0; right: 0; border: 0; width: 149px; height: 149px; background: url('{1}/preview/previewModeBadge.png') no-repeat;z-index: 9999999;" href="#" OnClick="javascript:window.top.location.href = '{0}/endPreview.aspx?redir={2}'"><span style="display:none;">In Preview Mode - click to end</span></a>]]></PreviewBadge>

    <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
         - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
@@ -51,15 +51,24 @@
    <MacroErrors>inline</MacroErrors>

    <!-- These file types will not be allowed to be uploaded via the upload control for media and content -->
-    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess</disallowedUploadFiles>
+    <disallowedUploadFiles>ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,xhtml,html,htm,svg,php,htaccess</disallowedUploadFiles>

    <!-- Defines the default document type property used when adding properties in the back-office (if missing or empty, defaults to Textstring -->
    <defaultDocumentTypeProperty>Textstring</defaultDocumentTypeProperty>
+
+    <!-- Enables value converters for all built in property editors so that they return strongly typed object, recommended for use with Models Builder -->
+    <EnablePropertyValueConverters>true</EnablePropertyValueConverters>
+	
+    <!-- You can specify your own background image for the login screen here. The image will automatically get an overlay to match back office colors - this path is relative to the ~/umbraco path. The default location is: /umbraco/assets/img/installer.jpg -->
+    <loginBackgroundImage>assets/img/installer.jpg</loginBackgroundImage>
+      
  </content>

  <security>
    <!-- set to true to auto update login interval (and there by disabling the lock screen -->
    <keepUserLoggedIn>false</keepUserLoggedIn>
+    <!-- by default this is true and if not specified in config will be true. set to false to always show a separate username field in the back office user editor -->
+    <usernameIsEmail>true</usernameIsEmail>
    <!-- change in 4.8: Disabled users are now showed dimmed and last in the tree. If you prefer not to display them set this to true -->
    <hideDisabledUsersInBackoffice>false</hideDisabledUsersInBackoffice>
  </security>
@@ -152,7 +161,10 @@
        Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco
        path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com".
  -->
-  <web.routing trySkipIisCustomErrors="true" internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false" umbracoApplicationUrl="">
+  <web.routing
+    trySkipIisCustomErrors="false"
+    internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"
+    umbracoApplicationUrl="">
  </web.routing>

 </settings>