bug
Merge branch 'master' of https://github.com/OpenWin/Walemao

Conflicts:
	Megastore/src/main/java/com/walemao/megastore/controller/LoginController.java