update toolbar
Merge branch 'dev' into build

Conflicts:
	.package/css/sui.css
	docs/toolbar.html