update jsp and fix bug
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	versat/src/com/action/FundAction.java