Signed-off-by: suding <suding174@sina.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git
Signed-off-by: suding <suding174@sina.com>
Merge branch 'master' of https://github.com/ferry9303/MS_Project.git

Conflicts:
	MShop/src/struts.xml