Choses
Merge origin/master

Conflicts:
	src/recyclapp/view/ElementPropertiesView.form
	src/recyclapp/view/ElementPropertiesView.java