ffff
yuema
mayue
aa
Merge branch 'master' of
https://github.com/wangzhenhuaCode/mutualFundWebsite

Conflicts:
	mutualFundWeb/WebContent/Home.jsp
	mutualFundWeb/WebContent/employee_customer.jsp
	mutualFundWeb/WebContent/employee_customer_New_Account.jsp
	mutualFundWeb/WebContent/employee_customer_deposit_check.jsp
	mutualFundWeb/WebContent/employee_customer_history.jsp
	mutualFundWeb/WebContent/employee_customer_resetpassword.jsp
	mutualFundWeb/WebContent/employee_customer_viewChangeProfile.jsp
	mutualFundWeb/build/classes/Struts/Action/EmployeeAction.class
	mutualFundWeb/src/Hibernate/DAO/TransactionDAO.java
	mutualFundWeb/src/Struts/Action/TransactionDayAction.java
	mutualFundWeb/src/struts.xml