Merge pull request #2 from SkyPHP/3.0

lower instead of ilike
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 pull request #111 from cjemagid/3.0

Changed the email class
in process of adding mandrill support for class.mailer.php
updated mailer class to allow providers
Merge pull request #113 from cjemagid/3.0

added support for providers
switched reset password to mandrill
Update reset-password.php
fix curl timeout
Merge branch 'upstream/3.0'
Merge branch '3.0' of github.com:cjemagid/cms into 3.0
trying to fix AQL problems
Merge pull request #115 from cjemagid/3.0

trying to fix AQL problems
Merge branch '3.0' of github.com:cjemagid/cms into 3.0
Added from to mandrill
added BCC to mandrill
Merge pull request #116 from cjemagid/3.0

added BCC to mandrill
sync vfolders for v2 and v3
Merge branch 'origin/3.0'