update: assets.
update: assets.
Merge branch 'master' into gh-pages
update: js.