Ajout des icones et du colorPicker
Merge branch 'master' of https://github.com/jeanbaptistedalle/scaling-adventure

Conflicts:
	src/dessin/collaboratif/view/component/ToolPanel.java