ass
edd
cdd
ddd
as
Merge branch 'master' of https://github.com/lianzhengkun/easyshopping into mylocal

Conflicts:
	pom.xml
	src/main/resources/hibernate.cfg.xml
	src/main/webapp/login.jsp