Merge branch 'master' of https://code.ill.fr/instrument-control/nomad-gui

ChangeLog

...ill/ics/client/view/collision/swt/SWTCollisionWindow.java

...ain/java/fr/ill/ics/client/view/factory/ColorFactory.java

...ain/java/fr/ill/ics/client/view/factory/ImageFactory.java

...a/fr/ill/ics/client/view/factory/swt/SWTColorFactory.java

src/main/resources/conf/client/clientMessages.properties

src/main/resources/img/pushButtons/showButton.png