Merge remote-tracking branch 'origin/contatti-new' into develop

MR: https://code.ubuntu-it.org/ubuntu-it-web/www/merge_requests/24
Signed-off-by: Mattia Rizzolo <mapreri@ubuntu.com>