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

Conflicts:
	Modules/BetterCms.Module.Root/BetterCms.Module.Root.csproj
Restored aold cms.config file
Fixes #596
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev
#588  Clearfix is rendered only if it's enabled in config
Merge branch '1.2.1-fix-API' into dev

Conflicts:
	Modules/BetterCms.Module.Api/Operations/MediaManager/Files/File/FileService.cs
	Modules/BetterCms.Module.Api/Operations/MediaManager/Files/FilesService.cs
	Modules/BetterCms.Module.Api/Operations/Pages/Pages/Page/Properties/PagePropertiesService.cs
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev
#547 Fix build
#588  Changed defautl value for rendering clearfix div
#601 Fixed options and option values merging
#602 Added server-side unique option key validation; option value cannot be deleted only when type and key are equal;
#603 When changing layout, automatically changing options edit and delete buttons;
Option values grid: boolean default value are displayed as read-only checkboxes
Fixed preview of editing server widget with options;
Fixed rendering of server widget history with options;
Logic of content history preview moved to service and reused in widget preview;
#547
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev
Users module: fixed order of database migration