added input changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/WEB-INF/applicationContext.xml
	WebContent/WEB-INF/springmvc-servlet.xml
	src/dfzq/dao/CompanyDao.java
	src/dfzq/dao/FundDao.java
commit local changes