update by jack 20140609
Merge branch 'master' of https://github.com/unisexx/bo_oracle

Conflicts:
	application/modules/fund/views/personal/reg_child/form.php