Merge origin/master

Conflicts:
	src/projettut/DemieJournee.java