update
Merge branch 'trunk' into inscription/connexion