updates toolbar
Merge branch 'scott_dev'
Merge branch 'mikedev'