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

Conflicts:
	Modules/BetterCms.Module.Root/BetterCms.Module.Root.csproj
Fixes #596
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev
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