editer dossier
Merge remote-tracking branch 'origin/master'

Conflicts:
	database.cpp
	mainfenetre.cpp
	mainfenetre.h
merges
Revert "merges"

This reverts commit c502158a46b532044511a2cb2014e6fac61db506.