diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
index a5d9808587c196fea71be6e1905d2c2873dbeb6d..5cb99d86af478aebea14b3e5c938ae55ed35bb9d 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
@@ -1,19 +1,34 @@
-//    Main window of the Student's GUI
-//
-//    Copyright (C) 2017  Angel Romero
+//    Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero
 //
-//    This program is free software: you can redistribute it and/or modify
+//    This file is part of D-FaLL-System.
+//    
+//    D-FaLL-System is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
+//    
+//    D-FaLL-System is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
-//
+//    
 //    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//    along with D-FaLL-System.  If not, see <http://www.gnu.org/licenses/>.
+//    
+//
+//    ----------------------------------------------------------------------------------
+//    DDDD        FFFFF        L     L           SSSS  Y   Y   SSSS  TTTTT  EEEEE  M   M
+//    D   D       F      aaa   L     L          S       Y Y   S        T    E      MM MM
+//    D   D  ---  FFFF  a   a  L     L     ---   SSS     Y     SSS     T    EEE    M M M
+//    D   D       F     a  aa  L     L              S    Y        S    T    E      M   M
+//    DDDD        F      aa a  LLLL  LLLL       SSSS     Y    SSSS     T    EEEEE  M   M
+//
+//
+//    DESCRIPTION:
+//    Main window of the Student's GUI
+//
+//    ----------------------------------------------------------------------------------
+
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h
index a33e0f82c3253cbe2e79da6c0958060b70fa80d7..193561248a04e927fc8b337f9384bbf6e33b07e8 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/rosNodeThread.h
@@ -1,19 +1,34 @@
-//    Takes care of creating a ros node thread.
-//
-//    Copyright (C) 2017  Angel Romero
+//    Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero
 //
-//    This program is free software: you can redistribute it and/or modify
+//    This file is part of D-FaLL-System.
+//    
+//    D-FaLL-System is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
+//    
+//    D-FaLL-System is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
-//
+//    
 //    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//    along with D-FaLL-System.  If not, see <http://www.gnu.org/licenses/>.
+//    
+//
+//    ----------------------------------------------------------------------------------
+//    DDDD        FFFFF        L     L           SSSS  Y   Y   SSSS  TTTTT  EEEEE  M   M
+//    D   D       F      aaa   L     L          S       Y Y   S        T    E      MM MM
+//    D   D  ---  FFFF  a   a  L     L     ---   SSS     Y     SSS     T    EEE    M M M
+//    D   D       F     a  aa  L     L              S    Y        S    T    E      M   M
+//    DDDD        F      aa a  LLLL  LLLL       SSSS     Y    SSSS     T    EEEEE  M   M
+//
+//
+//    DESCRIPTION:
+//    Takes care of creating a ros node thread.
+//
+//    ----------------------------------------------------------------------------------
+
 
 #ifndef ___ROSNODETHREAD_H___
 #define ___ROSNODETHREAD_H___
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
index ce54c47b4e3333e8d9691ca2a192485c559516c4..24c01a5eb84c8e8a7b4ae18c279a6a17082728ce 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
@@ -1,19 +1,34 @@
-//    Main window of the Student's GUI
-//
-//    Copyright (C) 2017  Angel Romero
+//    Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero
 //
-//    This program is free software: you can redistribute it and/or modify
+//    This file is part of D-FaLL-System.
+//    
+//    D-FaLL-System is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
+//    
+//    D-FaLL-System is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
-//
+//    
 //    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//    along with D-FaLL-System.  If not, see <http://www.gnu.org/licenses/>.
+//    
+//
+//    ----------------------------------------------------------------------------------
+//    DDDD        FFFFF        L     L           SSSS  Y   Y   SSSS  TTTTT  EEEEE  M   M
+//    D   D       F      aaa   L     L          S       Y Y   S        T    E      MM MM
+//    D   D  ---  FFFF  a   a  L     L     ---   SSS     Y     SSS     T    EEE    M M M
+//    D   D       F     a  aa  L     L              S    Y        S    T    E      M   M
+//    DDDD        F      aa a  LLLL  LLLL       SSSS     Y    SSSS     T    EEEEE  M   M
+//
+//
+//    DESCRIPTION:
+//    Main window of the Student's GUI
+//
+//    ----------------------------------------------------------------------------------
+
 
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp
index a200956f5ad5d327bb000465552cf4bef5852a16..27bdde984af32065c2c7c03ddef660376e51004a 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/main.cpp
@@ -1,19 +1,34 @@
-//    Main program of the Student's GUI
-//
-//    Copyright (C) 2017  Angel Romero
+//    Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero
 //
-//    This program is free software: you can redistribute it and/or modify
+//    This file is part of D-FaLL-System.
+//    
+//    D-FaLL-System is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
+//    
+//    D-FaLL-System is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
-//
+//    
 //    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//    along with D-FaLL-System.  If not, see <http://www.gnu.org/licenses/>.
+//    
+//
+//    ----------------------------------------------------------------------------------
+//    DDDD        FFFFF        L     L           SSSS  Y   Y   SSSS  TTTTT  EEEEE  M   M
+//    D   D       F      aaa   L     L          S       Y Y   S        T    E      MM MM
+//    D   D  ---  FFFF  a   a  L     L     ---   SSS     Y     SSS     T    EEE    M M M
+//    D   D       F     a  aa  L     L              S    Y        S    T    E      M   M
+//    DDDD        F      aa a  LLLL  LLLL       SSSS     Y    SSSS     T    EEEEE  M   M
+//
+//
+//    DESCRIPTION:
+//    Main program of the Student's GUI
+//
+//    ----------------------------------------------------------------------------------
+
 
 #include "MainWindow.h"
 #include <QApplication>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp
index 75296ca70b52bffb16db8406af6a3251ce4ca866..ce3b6182fe6e8576106c2a52292e9f5d81f6eae6 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/rosNodeThread.cpp
@@ -1,19 +1,34 @@
-//    Takes care of creating a ros node thread.
-//
-//    Copyright (C) 2017  Angel Romero
+//    Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero
 //
-//    This program is free software: you can redistribute it and/or modify
+//    This file is part of D-FaLL-System.
+//    
+//    D-FaLL-System is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
 //    the Free Software Foundation, either version 3 of the License, or
 //    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
+//    
+//    D-FaLL-System is distributed in the hope that it will be useful,
 //    but WITHOUT ANY WARRANTY; without even the implied warranty of
 //    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //    GNU General Public License for more details.
-//
+//    
 //    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//    along with D-FaLL-System.  If not, see <http://www.gnu.org/licenses/>.
+//    
+//
+//    ----------------------------------------------------------------------------------
+//    DDDD        FFFFF        L     L           SSSS  Y   Y   SSSS  TTTTT  EEEEE  M   M
+//    D   D       F      aaa   L     L          S       Y Y   S        T    E      MM MM
+//    D   D  ---  FFFF  a   a  L     L     ---   SSS     Y     SSS     T    EEE    M M M
+//    D   D       F     a  aa  L     L              S    Y        S    T    E      M   M
+//    DDDD        F      aa a  LLLL  LLLL       SSSS     Y    SSSS     T    EEEEE  M   M
+//
+//
+//    DESCRIPTION:
+//    Takes care of creating a ros node thread.
+//
+//    ----------------------------------------------------------------------------------
+
 
 #include "rosNodeThread.h"