added spring/hibernate3
Merge branch 'master' of https://github.com/zhonghuali/fjj

Conflicts:
	src/main/java/struts.xml