Update for mailing
Merge branch 'master' of https://github.com/OffWind/offwind

Conflicts:
	Offwind.WebApp/Offwind.WebApp/Views/Shared/EditorTemplates/CKFinder.cshtml
	Offwind.WebApp/Offwind.WebApp/Views/Shared/EditorTemplates/RtfEditor.cshtml
	Offwind.WebApp/Offwind.WebApp/Web.config