removed unused html markup from "edittemplate" & "editservercontrolwidget" modal windows.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev

Conflicts:
	Modules/BetterCms.Module.Pages/Views/Templates/EditTemplate.cshtml
	Modules/BetterCms.Module.Pages/Views/Widgets/EditServerControlWidget.cshtml