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

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