Merge branches 'master' and 'dev' into dev
add link twitter / correctif alter contact