ticker js
Merge branch 'js'
log