Merge pull request #111 from cjemagid/3.0

Changed the email class
Merge pull request #113 from cjemagid/3.0

added support for providers
Update reset-password.php
fix curl timeout
Merge branch 'upstream/3.0'
trying to fix AQL problems