Préférences - icone
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/Editor.java
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/Editor.java
	src/graphicInterface/MainWindow.java

Preferences Dialog ajourné
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/MainWindow.java

Merging