many changes, please use git diff for details
Merge branch 'release-1.1' of https://github.com/webbird/BlackCatCMS into release-1.1

Conflicts:
	upload/framework/CAT/Helper/Mail/SwiftDriver.php