Fix merging confilcts

.gitlab-ci.yml

nginx-development.conf

nginx-staging.conf

readme.md

webapp/package-lock.json

webapp/package.json

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

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

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

webapp/src/assets/img/footer-plus.png

webapp/src/environments/environment.ts

webapp/src/i18n/messages.en.xlf

webapp/src/i18n/messages.fr.xlf