邮箱发送配置
Merge branch 'master' of https://github.com/OpenWin/Walemao

Conflicts:
	Megastore/src/test/java/com/walemao/megastore/ForgetePasswordTest.java
	Megastore/src/test/java/com/walemao/megastore/sendEmailTest.java
	Megastore/src/test/java/com/walemao/megastore/service/test/ForgetePasswordTest.java