mysterious commit

Conflicts:
	Signum.Web.Extensions/Mailing/Scripts/ckeditor.js