Merge branch 'master' of /home/dsarrut/clitk3.server

diff --combined vv/vvRegisterForm.cxx
index 7dfc942635c2566a37fded523cfa41b2496312c2,b5ac7d9600f72fc9a436bc1ab761b0a0905ea36f..229fb2f135de6837120c4617d41a75176ae20e76
--- 1/vv/vvRegisterForm.cxx
--- 2/vv/vvRegisterForm.cxx
+++ b/vv/vvRegisterForm.cxx
@@@ -22,7 -22,7 +22,7 @@@
  #include <QDir>
  #include <QPalette>
  #include "common/globals.h"
- #include "vvCommon.h"
+ #include "vvConfiguration.h"
  #include "vvUtils.h"
  
  vvRegisterForm::vvRegisterForm(QUrl url, QString path, QSettings::Format format):url(url), settings(path, format){ 
@@@ -39,7 -39,6 +39,7 @@@ void vvRegisterForm::sendData()
    url2.addQueryItem("group", group->text().toUtf8());
    url2.addQueryItem("os", osName->text().toUtf8());
    url2.addQueryItem("vvVersion", VV_VERSION);
 +  url2.addQueryItem("architecture", ARCHITECTURE);
    manager->get(QNetworkRequest(url2));
  }
  void vvRegisterForm::accept(){
@@@ -66,4 -65,4 +66,4 @@@ void vvRegisterForm::show()
    
   osName->setText(QString::fromStdString(OS_NAME));
   QDialog::show();
- }
+ }