finish pasteacide
Merge branch 'master' of https://github.com/Belafonte-boat/millbo-website

Conflicts:
	locales/it.yml
Merge branch 'master' of https://github.com/Belafonte-boat/millbo-website

Conflicts:
	locales/it.yml