update js of indicators to work with oipa v2.1
Merge branch 'master' into OAS-dev
Merge branch 'OAS-dev' into OAS-staging