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

Conflicts:
	src/main/java/com/ibm/dao/impl/ProductCategoryDaoImpl.java
	src/main/resources/hibernate.cfg.xml
	src/main/resources/resources.properties