testings elementview
testings elementview
testings elementview
testings elementview
Merge origin/master

Conflicts:
	src/recyclapp/model/Controller.java
	src/recyclapp/model/JunctionModel.java
Merge origin/master

Conflicts:
	src/recyclapp/model/Controller.java
	src/recyclapp/model/JunctionModel.java
fix missing arg