fixed javascript syntax
fixed javascript syntax
updated js info
Merge origin/master