修改域名
Merge branch 'master' of https://github.com/dongql/mail.git

Conflicts:
	conf/mail.xml