fix javascript errors from lint report
Merge remote-tracking branch 'origin/master'