re
aaa
fdd
Merge branch 'master' of
https://github.com/wangzhenhuaCode/mutualFund.git

Conflicts:
	mutualFund/src/Hibernate/BaseDAO/BaseHibernateDAO.java
	mutualFund/src/Struts/Action/UserAJAXAction.java