Made the whitespace consistent in config files.

This may ease the frustration of web-developers doing upgrades.
Rebased `web.Template.config` - reapplied the whitespace fixes.
U4-4629 - Detecting existing macros

By setting the ID of the macro the repository layer will update the existing instance rather than trying to create a new one, which would result in a duplicate alias and that violates a table index.
Now inserting mediaId in the link picker and setting the isMedia flag so that you can get mediaId's from the linkPicker dialogservice
Added removal of isMedia whenever a contentnode is selected
Added check to rte controller so as not to reload tinymce script if it's already loaded (we don't check the CSS, but I figure this is ok) [This is temp bandaid for #U4-4724]
A better test (checks to see if it's even defined)
Update web.config with .woff mime support

Bootstrap icons aren't visible on Windows Phone because it uses the .woff variant but the mimetype isn't available. Updated the web.config and added .woff to the staticContent section of system.webServer.
Fixes U4-4767 and adds a Test for it
Added Test for getting a crop on a Upload property type instead of a Cropper
Fixes: U4-4765 backoffice user section does not save password changes in v6.2
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
Merge pull request #362 from Jeavon/U4-4767

Fixes U4 4767 and adds 2 Tests
Merge pull request #360 from Jwheuvel/7.1.2

Update web.config with .woff mime support
Merge pull request #356 from mattbrailsford/7.1.2-rtetinymcecheck

Added check to rte controller so as not to reload tinymce script
Merge branch 'patch-1' of https://github.com/aaronpowell/Umbraco-CMS into aaronpowell-patch-1
Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2
Adds .woff mime type
Merge branch 'U4-898' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-898
Moves XML serialization for content/media/members to a resusable class: EntityXmlSerializer to remove the circular references we have by using the ToXml extension methods from directly in the services. This has been completed for the ContentService, next is Media and Member services. Updates the ContentService to not perform CUD operations for preview or published xml, this is now done at the repository level and now done in a single transaction for the saving and publishing events. Still need to do that for the member and media services too and the remaining methods in the content service