After merge with master

.classpath

.project

Nomad.sh

conf/client/commandLine.txt

pom.xml

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

...r/ill/ics/client/control/parser/ControllerViewParser.java

.../client/control/parser/descriptor/PlotDataDescriptor.java

...nt/control/parser/descriptor/widget/WidgetDescriptor.java

src/main/java/fr/ill/ics/client/control/plot/PlotData.java

...ain/java/fr/ill/ics/client/control/plot/PlotyManager.java

...va/fr/ill/ics/client/control/plot/ProjectionPlotData.java

...java/fr/ill/ics/client/control/plot/PropertyPlotData.java

...n/java/fr/ill/ics/client/control/plot/SurveyPlotData.java

...in/java/fr/ill/ics/client/control/token/TokenManager.java

src/main/java/fr/ill/ics/client/view/MainWindowPeer.java

...n/java/fr/ill/ics/client/view/factory/PWidgetFactory.java

...fr/ill/ics/client/view/factory/swt/SWTPWidgetFactory.java

.../ill/ics/client/view/pluginpeer/ControllerPluginPeer.java

...in/java/fr/ill/ics/client/view/swt/SWTMainWindowPeer.java