Merge remote-tracking branch 'origin/master'

Conflicts:
	Notes & Documentations/~$VA_RapportFinProjet.docx