Minor change to StaffRmb
Imporved Foreign Currency Options
Merge branch 'StaffRmb' into development