Merge V4.0 to master

.project

ChangeLog

Nomad.sh

TransferLogs.sh

conf/client/clientMessages.properties

conf/client/commandLine.txt

conf/client/globalLabels.properties

conf/client/menu.xml

...trollers/instrument_setting/instrument_setting.properties

conf/server/controllersAndFamilies.properties

docs/PluginCreationSummary.odt

docs/PluginCreationSummary.pdf

lib/nomadgui-gtk.linux.x86.jar

lib64/nomadgui-gtk.linux.x86_64.jar

lib64/nomadmail.jar

pom.xml

src/main/java/fr/ill/ics/apps/LogsTransfer.java

src/main/java/fr/ill/ics/apps/LogsTransferCaller.java

src/main/java/fr/ill/ics/client/control/MainWindow.java

.../java/fr/ill/ics/client/control/chat/ChatFileManager.java