edit
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping

Conflicts:
	src/main/webapp/WEB-INF/web.xml