diagramme de classe
Merge branch 'master' of https://github.com/SCLiveP7/Project

Conflicts:
	deliverables/architecture/classdiagramme.xmi
Merge branch 'master' of https://github.com/SCLiveP7/Project
Merge branch 'master' of https://github.com/SCLiveP7/Project

Conflicts:
	deliverables/skeleton/.cache