Update javascirpt
Merge branch 'master' into f-feesRewrite