Merge branch 'master' of https://github.com/TinderBox/Design

Conflicts:

UI/app/assets/stylesheets/ignite/document/panels/document_panel.css.scss
Resolving Conflict in Doc Panel