#456 and #438 implementation.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev

Conflicts:
	Modules/BetterCms.Module.Templates/TemplatesModuleDescriptor.cs