Definition des classes de bases
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetPriseDeNote/ProjetPriseDeNote.pro