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

Conflicts:
	Modules/BetterCms.Module.Root/BetterCms.Module.Root.csproj