Toolbar now follows singleton pattern
Merge branch 'dev-gradle' into refactor-toolbar