Model Wizard turned back on.

Helicopter part diasabled since it is not finished. The rest should work.

companion/src/mdichild.cpp

@@ -186,7 +186,6 @@ void MdiChild::modelEdit()
 
 void MdiChild::wizardEdit()
 {
-return modelEdit();  // TODO FOR BERTRAND- REMOVE THIS LINE TO TURN THE WIZARD BACK ON
   int row = ui->modelsList->currentRow();
   if (row > 0) {
     checkAndInitModel(row);

companion/src/wizarddialog.cpp

@@ -209,6 +209,7 @@ ModelSelectionPage::ModelSelectionPage(WizardDialog *dlg, QString image, QString
   planeRB->setChecked(true);
   multirotorRB = new QRadioButton(tr("Multirotor"));
   helicopterRB = new QRadioButton(tr("Helicopter"));
+  helicopterRB->setDisabled(true);  //TODO REMOVE TO ENABLE HELICOPTERS
 
   registerField("evaluate.name*", nameLineEdit);
 
@@ -745,8 +746,8 @@ ConclusionPage::ConclusionPage(WizardDialog *dlg, QString image, QString title,
   registerField("evaluate.proceed*", proceedCB);
 
   QLayout *l = layout();
-  l->addWidget(textLabel);
   l->addWidget(proceedCB);
+  l->addWidget(textLabel);
 }
 
 void ConclusionPage::initializePage(){