Merge branch '236-header' into 'dev'

src/app/header/header.component.html

src/app/shared/components/button/button.component.html

src/app/shared/components/button/button.component.ts