Fin de la connexion/inscrption
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	target/stacktrace.log