Merge branch 'design'
Merge branch 'master' into design
Sidebar y toolbar.