Merge branch 'master' into PacsConnection

diff --cc common/CMakeLists.txt
Simple merge

diff --cc vv/vvMainWindow.cxx
index e3e5c993f88b2123643b9ddafa123b55bb54aa73,15e1d910c4163103205447bf5d35aebb8bb25d4b..c07100df0d224d7230864b849bf7f59242f2f5f7
--- 1/vv/vvMainWindow.cxx
--- 2/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -47,10 -47,8 +47,11 @@@ It is distributed under dual licenc
  #include "vvMeshReader.h"
  #include "vvSaveState.h"
  #include "vvReadState.h"
 +#ifdef CLITK_USE_PACS_CONNECTION
 +#include "vvQPacsConnection.h"
 +#endif
  #include "clitkConfiguration.h"
+ #include "clitkMatrix.h"
  
  // ITK include
  #include <itkImage.h>

diff --cc vv/vvMainWindow.h
Simple merge