Conflicts:
	workbench/menu-button.html
	workbench/toolbar.html