Fixes: U4-5981 Umbraco 7.2 Text encoding when saving partial view template
Merge branch 'dev-v7' into 7.3.0

Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
Fixes merge and file encoding for master pages and templates to have BOM
Merge branch '7.3.0' into dev-v7-centralizedloadbalancing