update 
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	versat/WebContent/WEB-INF/scripts/fund.sql
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'
Merge remote-tracking branch 'choose_remote_name/master'