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