fang work
Merge branch 'master' of git@github.com:wgychris/Task7.git

Conflicts:
	MutualFund/src/controller/E_ResetPwdAction.java
	MutualFund/src/controller/E_ViewCustomerAction.java
	MutualFund/src/model/PositionDAO.java