backbone refactors
updating master branch

Merge branch 'master' into toolbar-refactor
more progress on toolbar refactor