[bugfix] toolbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/default/_css/toolbar.horizontal.css