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

Conflicts:
	src/main/resources/hibernate.cfg.xml
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping
main.jsp
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping