Finalisation du partage de fichier
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	App/Juntos/bdd.cpp
	App/Juntos/mainwindow.h