merge latest master and fix conflict

package.json

src/components.d.ts

src/components/hy-search-field/hy-search-field.scss

src/components/hy-search-field/readme.md

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

...te-header/hy-desktop-menu-links/hy-desktop-menu-links.tsx

src/components/site-header/readme.md

src/components/site-header/site-header.tsx

src/components/site-header/site-search/readme.md

src/components/site-header/site-search/site-search.scss

src/components/site-header/site-search/site-search.tsx