Update javascript documentation.
Merge conflicts.