Divers
Divers
Merge remote-tracking branch 'origin/essai-qt' into essai-qt

Conflicts:
	Makefile.am
	Makefile.in
	configure
	configure.ac
	src/Makefile.in
	src/fenetreprincipale.cpp
	src/fenetreprincipale.h