Lien entre matrix et InterfaceParam
Merge branch 'master' of https://github.com/baudsp/Projet-ulaval-centre-de-recyclage---daltons

Conflicts:
	Code/RecyclApp/src/recyclapp/model/Element.java
	Code/RecyclApp/src/recyclapp/model/EntreeUsine.java
	Code/RecyclApp/src/recyclapp/model/Plan.java
	Code/RecyclApp/src/recyclapp/view/InterfaceParam.java