fixing a merge conflict.
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev
Toolbar changes, not yet fixed.