Merge branch 'master' of github.com:cboillet/LO21

Conflicts:
	CODE/projet/projet.pro.user
Merge branch 'master' of github.com:cboillet/LO21

Conflicts:
	CODE/projet/projet.pro.user