Pull latest master and fix conflict

package.json

src/components.d.ts

src/components/accordion-item/accordion-item.scss

src/components/accordion-item/accordion-item.tsx

src/components/accordion-item/readme.md

src/components/hy-checkbox/hy-checkbox.scss

src/components/hy-checkbox/hy-checkbox.tsx

src/components/hy-checkbox/readme.md

src/components/hy-list-item/hy-list-item.scss

src/components/hy-list-item/hy-list-item.tsx

src/components/hy-list-item/readme.md

src/components/hy-person-card/hy-person-card.scss

src/components/hy-person-card/hy-person-card.tsx

src/components/hy-person-card/readme.md

src/components/icon/icon.tsx

src/components/icon/readme.md

...navigation/menu-level-container/menu-level-container.scss

src/components/navigation/menu-sidebar/menu-sidebar.scss

src/components/navigation/menu-sidebar/menu-sidebar.tsx

src/components/pagination/hy-pager-item/hy-pager-item.scss