enable mail
Merge branch 'master' of github.com:Huaxin-DevTeam/web

Conflicts:
	protected/config/main.php