Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java
Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java
Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java
Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java
Merge origin/master

Conflicts:
	RecyclApp/src/recyclapp/RecyclApp.java
ajout convoyeur et junction
Merge origin/master
version fonctionnelle avec toute les models