#309 When saving/loading server widget or html content, saving/loading edit mode; same with html content;
#309 When saving/loading server widget or html content, saving/loading edit mode; same with html content; resolved conflicts;

Merge branch 'dev' of github.com:devbridge/BetterCMS into dev

Conflicts:
	Modules/BetterCms.Module.Pages/Command/Content/SavePageHtmlContent/SavePageHtmlContentCommand.cs
	Modules/BetterCms.Module.Pages/Views/Content/Partial/EditHtmlContent.cshtml
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev