finished js
Merge remote-tracking branch 'origin/Mikhail' into Nick
Merge remote-tracking branch 'origin/Nick' into Mikhail