Re applied Brandon's change to the email class.
Removed object to array conversion in the mailer class, added a data var to the class
Merge branch '3.0' of https://github.com/cjemagid/cms into 3.0

Conflicts:
	lib/class/class.Mailer.php