[newFeature] toolbar.css
Merge remote-tracking branch 'origin/master'
[newFeature] toolbar.js
Merge remote-tracking branch 'origin/master'