Merge V4 to master

.cproject

src/CommandLineTest.cpp

src/Common.h

src/LocalNomadState.cpp

src/ModuleUnitaryTest.cpp

src/NomadImageJ.cpp

src/NomadShell.cpp

src/NomadState.cpp

src/OldNomadState.cpp