Fix merge

nginx-staging.conf

webapp/.angular-cli.json

webapp/package-lock.json

webapp/package.json

webapp/src/app/_app-theme.component.scss

webapp/src/app/app.component.scss

webapp/src/app/app.component.ts

...c/app/core/components/footer/_footer-theme.component.scss

webapp/src/app/core/components/footer/footer.component.html

webapp/src/app/core/components/footer/footer.component.scss

...c/app/core/components/header/_header-theme.component.scss

webapp/src/app/core/components/header/header.component.html

webapp/src/app/core/components/header/header.component.scss

webapp/src/app/core/components/header/header.component.ts

.../app/editorialisation/components/home/home.component.html

.../app/editorialisation/components/home/home.component.scss

...-posts-list-tile/wordpress-posts-list-tile.component.html

...ss-posts-list-tile/wordpress-posts-list-tile.component.ts

.../wordpress-posts-list/wordpress-posts-list.component.html

...app/editorialisation/services/editorialisation.service.ts