bug fixed
Merge remote-tracking branch 'choose_remote_name/master'

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