toolbar refactor times
tbrefactor
updating master branch

Merge branch 'master' into toolbar-refactor
more progress on toolbar refactor
m
super amazing awesome toolbar success
super amazing awesome toolbar success
super amazing awesome toolbar success
merge in from dan's master

Merge branch 'master' into toolbar-refactor