#.project
add info action
add info action by cl
Merge remote-tracking branch 'origin/master' into cl

Conflicts:
	.gitignore
	.project
modify project
Merge remote-tracking branch 'origin/cl'

Conflicts:
	pom.xml
	src/main/java/hhjt/action/TestAction.java
	src/main/java/hhjt/dao/impl/OrderDaoImpl.java
	src/main/java/hhjt/service/AccountService.java
	src/main/java/hhjt/service/impl/AccountServiceImpl.java
	src/main/resources/struts.xml