Please enter the commit message for your changes. Lines starting
Merge branch 'develop' of https://github.com/wangqisen/EasyService into develop

Conflicts:
	WebRoot/user/login.jsp
	WebRoot/user/registerSuccess.jsp
rm EasyService.war
Merge branch 'develop' of https://github.com/wangqisen/EasyService into develop

Conflicts:
	WebRoot/display_product.jsp
	WebRoot/list_product.jsp