Revert mauvais merge
Merge branch 'master' into cohesion

Conflicts:
	src/recyclapp/gui/DrawingPanel.java
	src/recyclapp/gui/GridDrawer.java