Mail setup 1
Merge remote-tracking branch 'github/master'

Conflicts:
	app/controllers/auth/AuthController.php
Signup Email Verification setup 1