diff --git a/GUI/coregui/Models/ApplicationModels.cpp b/GUI/coregui/Models/ApplicationModels.cpp
index 56d5b5ab3ecff74a07d737f02ed56be95db6e4ef..bc98469cf67a6b3739c00f6c102dbfd3e95a4d5d 100644
--- a/GUI/coregui/Models/ApplicationModels.cpp
+++ b/GUI/coregui/Models/ApplicationModels.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ApplicationModels.h b/GUI/coregui/Models/ApplicationModels.h
index ad7479e38f594e044df526c95c062c6e3773a3dc..ba118657097f6a5d473d5b2c741c7f6570b4d310 100644
--- a/GUI/coregui/Models/ApplicationModels.h
+++ b/GUI/coregui/Models/ApplicationModels.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/AxesItems.cpp b/GUI/coregui/Models/AxesItems.cpp
index c11d5536454adfadf5fb347976c66e8d5e50028a..d2badfcbba4b2b3cd8fba83c390c2250dc1cd7c0 100644
--- a/GUI/coregui/Models/AxesItems.cpp
+++ b/GUI/coregui/Models/AxesItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/AxesItems.h b/GUI/coregui/Models/AxesItems.h
index a6c5ac751d5748ee80d43e87a7e67fa4c2e79b0d..0d24586c17e4bbfc69d7a7c404a3f7e67f5bc431 100644
--- a/GUI/coregui/Models/AxesItems.h
+++ b/GUI/coregui/Models/AxesItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BackgroundItems.cpp b/GUI/coregui/Models/BackgroundItems.cpp
index 88dc739a872f19894b0fbf83e74a663229b42585..e94821f4b953faa178a02c3d4c61bf1204f7b9a6 100644
--- a/GUI/coregui/Models/BackgroundItems.cpp
+++ b/GUI/coregui/Models/BackgroundItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BackgroundItems.h b/GUI/coregui/Models/BackgroundItems.h
index dd83ebbb37c215b07a6870b9ebd9d691bc10e019..6f064dbfe03e5d2bde18b2992fdce7d7c3ca4e77 100644
--- a/GUI/coregui/Models/BackgroundItems.h
+++ b/GUI/coregui/Models/BackgroundItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamAngleItems.cpp b/GUI/coregui/Models/BeamAngleItems.cpp
index 8812e5376cb5a384f20d2e575931426905f5e6bb..8dadbe74bdb0aabeb124e1a98f78cc7f79aa5214 100644
--- a/GUI/coregui/Models/BeamAngleItems.cpp
+++ b/GUI/coregui/Models/BeamAngleItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamAngleItems.h b/GUI/coregui/Models/BeamAngleItems.h
index 167a4a95f4180475009609f368b7f498d49a1ab9..3012cfe70381e7bf3ec572a73ef4bff1aab1f82d 100644
--- a/GUI/coregui/Models/BeamAngleItems.h
+++ b/GUI/coregui/Models/BeamAngleItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamDistributionItem.cpp b/GUI/coregui/Models/BeamDistributionItem.cpp
index fdd98dae396a18bff5a08e1135aa398291bd0b2c..9d2a7453864f7d95cdd6d13567579e76d81ce17d 100644
--- a/GUI/coregui/Models/BeamDistributionItem.cpp
+++ b/GUI/coregui/Models/BeamDistributionItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamDistributionItem.h b/GUI/coregui/Models/BeamDistributionItem.h
index 3bfcc3cc335f8a6eb771e922607cfede38fd1f08..f31e09199013ca9a6d60b61c87d10454e8621560 100644
--- a/GUI/coregui/Models/BeamDistributionItem.h
+++ b/GUI/coregui/Models/BeamDistributionItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamItem.cpp b/GUI/coregui/Models/BeamItem.cpp
index 819bddda6a4bf8d4aeb1bf48b4ea04f2078df1ed..5339e45e23d8ec21521e16048911decef3aa6666 100644
--- a/GUI/coregui/Models/BeamItem.cpp
+++ b/GUI/coregui/Models/BeamItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamItem.h b/GUI/coregui/Models/BeamItem.h
index c9b32605f73f80500ed466cba4ab2297b0b446db..c14e4da621c16fbd4abd5d73d15c895f2971bff8 100644
--- a/GUI/coregui/Models/BeamItem.h
+++ b/GUI/coregui/Models/BeamItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamWavelengthItem.cpp b/GUI/coregui/Models/BeamWavelengthItem.cpp
index 8e56a6a887bc8aa532291084fa3baa985457bf1f..e199c0c4c9278883e189922324ecd51af23b5fae 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.cpp
+++ b/GUI/coregui/Models/BeamWavelengthItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/BeamWavelengthItem.h b/GUI/coregui/Models/BeamWavelengthItem.h
index 5d15aea36685bb03890ad3b53f5fc4e1ae03f4c8..24bfe944eabf7e1e32954a6bed623798ad8b6b89 100644
--- a/GUI/coregui/Models/BeamWavelengthItem.h
+++ b/GUI/coregui/Models/BeamWavelengthItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComboProperty.cpp b/GUI/coregui/Models/ComboProperty.cpp
index 25230e509081070d69bff707c08c3f0f0f406824..d04d103c469178f4959eb894868ac76068a5fe48 100644
--- a/GUI/coregui/Models/ComboProperty.cpp
+++ b/GUI/coregui/Models/ComboProperty.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index 3cc25a8c2f083eed749a4f8e2ac239e5e58205cc..54373741cc719c4e31926ffb16ef7bf6722b6534 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComponentProxyModel.cpp b/GUI/coregui/Models/ComponentProxyModel.cpp
index 0efe56a0a86619f9c3c8e28e6ae3051bb8162381..f630b4c58eb88657e31214abae2c10cc83b8787e 100644
--- a/GUI/coregui/Models/ComponentProxyModel.cpp
+++ b/GUI/coregui/Models/ComponentProxyModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComponentProxyModel.h b/GUI/coregui/Models/ComponentProxyModel.h
index 8ecd5b7a84c62431081f7941fd78d11591959963..0dfd055caef392aa9a3e2f052ba2c6052f29da68 100644
--- a/GUI/coregui/Models/ComponentProxyModel.h
+++ b/GUI/coregui/Models/ComponentProxyModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.cpp b/GUI/coregui/Models/ComponentProxyStrategy.cpp
index 39cb9c25bc5e2ee59a206d4840333147a95d5b1e..50d541a1835a314b584e92eed7bab5e0edea21b2 100644
--- a/GUI/coregui/Models/ComponentProxyStrategy.cpp
+++ b/GUI/coregui/Models/ComponentProxyStrategy.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ComponentProxyStrategy.h b/GUI/coregui/Models/ComponentProxyStrategy.h
index b0b5f190daa9b395eddb0df3bc50cdfc10f1ac9e..52ac0e2a23baa30b998adb51d51521b6ea68495d 100644
--- a/GUI/coregui/Models/ComponentProxyStrategy.h
+++ b/GUI/coregui/Models/ComponentProxyStrategy.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DetectorItems.cpp b/GUI/coregui/Models/DetectorItems.cpp
index a251ad943162c8a53c5b4ac3ec068811ec69d99c..334e9a8a316cbc45f2146c13b763d4165ac2d1fb 100644
--- a/GUI/coregui/Models/DetectorItems.cpp
+++ b/GUI/coregui/Models/DetectorItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DetectorItems.h b/GUI/coregui/Models/DetectorItems.h
index 6f2b4cfda95f42134cd5a43a89c014252bffc9c7..052124adf81b32009751caa3ed77c6a2df670726 100644
--- a/GUI/coregui/Models/DetectorItems.h
+++ b/GUI/coregui/Models/DetectorItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DistributionItems.cpp b/GUI/coregui/Models/DistributionItems.cpp
index cd13f8f6ce3981c2ca766c1628b13954de558736..fe611103e5bd4af3634c27b522e40b71f814f9f4 100644
--- a/GUI/coregui/Models/DistributionItems.cpp
+++ b/GUI/coregui/Models/DistributionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DistributionItems.h b/GUI/coregui/Models/DistributionItems.h
index 1983888240aea2b795c6dbfed3fff8346d35bf0f..e4e1c2f95c007c9fb5d838a216bf843909dd3477 100644
--- a/GUI/coregui/Models/DistributionItems.h
+++ b/GUI/coregui/Models/DistributionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DocumentModel.cpp b/GUI/coregui/Models/DocumentModel.cpp
index 8afe0ebc275aa7a97cf6541cfccf97d5cee09912..47e5b7b26efeb54db92fa9a8327bb0ab83e4dd2f 100644
--- a/GUI/coregui/Models/DocumentModel.cpp
+++ b/GUI/coregui/Models/DocumentModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DocumentModel.h b/GUI/coregui/Models/DocumentModel.h
index c4ee63c24f2c0fa6a130c6d589171662de7148a3..6db296a3ad8572b3ec01e683d88bc1b8b694df66 100644
--- a/GUI/coregui/Models/DocumentModel.h
+++ b/GUI/coregui/Models/DocumentModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainFittingBuilder.cpp b/GUI/coregui/Models/DomainFittingBuilder.cpp
index fcd94d8bfdabbc67d45c62117df6390522978806..dda17e8187a008de38968a641b865975abacdd51 100644
--- a/GUI/coregui/Models/DomainFittingBuilder.cpp
+++ b/GUI/coregui/Models/DomainFittingBuilder.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainFittingBuilder.h b/GUI/coregui/Models/DomainFittingBuilder.h
index 581f11054cb8c08fd0edb9bb63341a7a20fae639..b684a559df8d6e8d53405bdce0605a9a3b9c440c 100644
--- a/GUI/coregui/Models/DomainFittingBuilder.h
+++ b/GUI/coregui/Models/DomainFittingBuilder.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 94ccbdbaddce00e47f506d301feadf64e0065094..f24efa04ab013101dc26cdcce0fc2055b467478f 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainObjectBuilder.h b/GUI/coregui/Models/DomainObjectBuilder.h
index b1de2fc458b768f085e8c6fca7f038ec2fbda926..f0a636fa5a1113680806da26b0b7ee373cdeb5d2 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.h
+++ b/GUI/coregui/Models/DomainObjectBuilder.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.cpp b/GUI/coregui/Models/DomainSimulationBuilder.cpp
index ab0480656f16fbdb363aa95964adbf75f3c21efb..b3741fb1d7e5b9083156f36167d32dfa8cec0c26 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.cpp
+++ b/GUI/coregui/Models/DomainSimulationBuilder.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/DomainSimulationBuilder.h b/GUI/coregui/Models/DomainSimulationBuilder.h
index cfc1fe15df2e709b5388c935ac6a532550054eb6..a59af0c0e016200bfbf640229661edb0da7e5023 100644
--- a/GUI/coregui/Models/DomainSimulationBuilder.h
+++ b/GUI/coregui/Models/DomainSimulationBuilder.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.cpp b/GUI/coregui/Models/FTDecayFunctionItems.cpp
index a5976123a6be0ed67e1d603f7d1630080b1a8b7d..06129b21c3bdf95033cb67bf5a2b7a12caacc634 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.cpp
+++ b/GUI/coregui/Models/FTDecayFunctionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FTDecayFunctionItems.h b/GUI/coregui/Models/FTDecayFunctionItems.h
index 9868d893493ce925b93ab4b9b4106f08700a6b72..1cfa7005aadfa043b09187b3e8f48116026513ef 100644
--- a/GUI/coregui/Models/FTDecayFunctionItems.h
+++ b/GUI/coregui/Models/FTDecayFunctionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FTDistributionItems.cpp b/GUI/coregui/Models/FTDistributionItems.cpp
index e1db15d81a6e9c0a90c42fd1ea2d0629a9762ab4..f075be6fd6d1ac79536b9818967e36c8ba6b001e 100644
--- a/GUI/coregui/Models/FTDistributionItems.cpp
+++ b/GUI/coregui/Models/FTDistributionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FTDistributionItems.h b/GUI/coregui/Models/FTDistributionItems.h
index ed07faf4c3f941d4d5b31ce72a0b29b35360cc84..c9e663a1932120a171af5478dfcd3dfbb2ce6783 100644
--- a/GUI/coregui/Models/FTDistributionItems.h
+++ b/GUI/coregui/Models/FTDistributionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FilterPropertyProxy.cpp b/GUI/coregui/Models/FilterPropertyProxy.cpp
index d526747ca8e61b3791b2d88257635612d38f5f77..ea243af6dfa6ac6066ef2049065d83287ad3b7f2 100644
--- a/GUI/coregui/Models/FilterPropertyProxy.cpp
+++ b/GUI/coregui/Models/FilterPropertyProxy.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FilterPropertyProxy.h b/GUI/coregui/Models/FilterPropertyProxy.h
index 9a10a74b3f66c41c1de9730c291f14b22e66a5a5..798954de62fe55f66184ba54cfcc66b83b178d77 100644
--- a/GUI/coregui/Models/FilterPropertyProxy.h
+++ b/GUI/coregui/Models/FilterPropertyProxy.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 #ifndef FILTERPROPERTYPROXY_H
diff --git a/GUI/coregui/Models/FitParameterHelper.cpp b/GUI/coregui/Models/FitParameterHelper.cpp
index a1c79188d33c27f7572c3dd8b0e266426270768a..a4ab19206182cf7940f847d1f55c75b9cb4e6e3f 100644
--- a/GUI/coregui/Models/FitParameterHelper.cpp
+++ b/GUI/coregui/Models/FitParameterHelper.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitParameterHelper.h b/GUI/coregui/Models/FitParameterHelper.h
index e8352e26e9a0251d21113a41767d0f74755dd894..9ece25c25b6c56b8cf12735c5dc4b81e019d9d4a 100644
--- a/GUI/coregui/Models/FitParameterHelper.h
+++ b/GUI/coregui/Models/FitParameterHelper.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
index 5af338c839bd9c437bfd927157044dd65fb7dee7..63a817e9242a8a9567dc8ec35e1a1185208cf572 100644
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ b/GUI/coregui/Models/FitParameterItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/FitParameterItems.h
index 93bcac271a48c122c81c92290bc8763e28a85155..1f6b1d5d46993d580b09f1ceadb5002749a795e2 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/FitParameterItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitParameterProxyModel.cpp b/GUI/coregui/Models/FitParameterProxyModel.cpp
index c0f84437513b5c8af171f1c38398d8cb66b0436d..f87bf7f4786ef3e0c58876531f7030ccb5ee08e8 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.cpp
+++ b/GUI/coregui/Models/FitParameterProxyModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitParameterProxyModel.h b/GUI/coregui/Models/FitParameterProxyModel.h
index 0be71929a9ef647498b6874b6028da1203baf928..b6d297e401b722c8dad5590727223270c146bd9e 100644
--- a/GUI/coregui/Models/FitParameterProxyModel.h
+++ b/GUI/coregui/Models/FitParameterProxyModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitSuiteItem.cpp b/GUI/coregui/Models/FitSuiteItem.cpp
index 2f069e65b6fb336aeb5af62ba76688669207c81c..18f1d6a4c67bc558aee65a1771bfe7e29396896e 100644
--- a/GUI/coregui/Models/FitSuiteItem.cpp
+++ b/GUI/coregui/Models/FitSuiteItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FitSuiteItem.h b/GUI/coregui/Models/FitSuiteItem.h
index 0aca440339bf35121cdd2ae87061396c658144f8..06c4c3b86e2a6157e54d241bfff87f944c1ed9ee 100644
--- a/GUI/coregui/Models/FitSuiteItem.h
+++ b/GUI/coregui/Models/FitSuiteItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FormFactorItems.cpp b/GUI/coregui/Models/FormFactorItems.cpp
index e87bb777a5a9e1e34d871cea3dab5c540be06c4e..bc570d554c62a96aff56c859b5687addcb0941b8 100644
--- a/GUI/coregui/Models/FormFactorItems.cpp
+++ b/GUI/coregui/Models/FormFactorItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/FormFactorItems.h b/GUI/coregui/Models/FormFactorItems.h
index bf7356f735d9e471f0ff6e0b4455db42f1ecd168..e456861c32e0e8db217135c0d746d16d2df140a1 100644
--- a/GUI/coregui/Models/FormFactorItems.h
+++ b/GUI/coregui/Models/FormFactorItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GUIExamplesFactory.cpp b/GUI/coregui/Models/GUIExamplesFactory.cpp
index e54547cd7e498c8673f5cb1b517241a4b1d10c86..8072d6df862136fd04538c131aca49ecd24dd6b5 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.cpp
+++ b/GUI/coregui/Models/GUIExamplesFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GUIExamplesFactory.h b/GUI/coregui/Models/GUIExamplesFactory.h
index 0821211427e4d92b6d8acd2f3d82621472f074e6..b54cd926841958c0f6bfb9d3111fcab98b945712 100644
--- a/GUI/coregui/Models/GUIExamplesFactory.h
+++ b/GUI/coregui/Models/GUIExamplesFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GUIObjectBuilder.cpp b/GUI/coregui/Models/GUIObjectBuilder.cpp
index 9f8bb34ecc8468f98e130f01f1c00451ea00ec8f..58364af345355d8306eaa87285d1345aa04c0c7a 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.cpp
+++ b/GUI/coregui/Models/GUIObjectBuilder.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index 9d1ea418f0c2278623d99f5c41deb333c67c0470..66a928e565887cca59670840cc2dbb72a2b153f0 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupInfo.cpp b/GUI/coregui/Models/GroupInfo.cpp
index 66877e8517b9f1182c2c07f6b2f739e8279b1a93..44f97636a8770985eee6701c480076bc63f2937b 100644
--- a/GUI/coregui/Models/GroupInfo.cpp
+++ b/GUI/coregui/Models/GroupInfo.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupInfo.h b/GUI/coregui/Models/GroupInfo.h
index 55b677957f73a60226c5e7d046129b0959a579e9..d1d51c339c935a768762a94d1d40fd224ce94416 100644
--- a/GUI/coregui/Models/GroupInfo.h
+++ b/GUI/coregui/Models/GroupInfo.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.cpp b/GUI/coregui/Models/GroupInfoCatalogue.cpp
index 3a3f5d89f66d9b60c75dc1051fd678b6f1d2e170..c083a0303b45ddb493c09dc2fbb71b2b8891621a 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.cpp
+++ b/GUI/coregui/Models/GroupInfoCatalogue.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupInfoCatalogue.h b/GUI/coregui/Models/GroupInfoCatalogue.h
index 282125052f5362c8ba51f214d675317e7d9eca42..fcbdbf8b6aed2aaf649f53679aefed7ec024e51e 100644
--- a/GUI/coregui/Models/GroupInfoCatalogue.h
+++ b/GUI/coregui/Models/GroupInfoCatalogue.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupItem.cpp b/GUI/coregui/Models/GroupItem.cpp
index ec92c13c1205b622c20e5bc4720dcbc7af629eec..a1d848cb3dfef02763775068abe21d995c0be99a 100644
--- a/GUI/coregui/Models/GroupItem.cpp
+++ b/GUI/coregui/Models/GroupItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupItem.h b/GUI/coregui/Models/GroupItem.h
index 9aafb6b02607352216abb56db379aab363529287..93e662cfe69afc4f9684e8f2f0f7f7348057d67d 100644
--- a/GUI/coregui/Models/GroupItem.h
+++ b/GUI/coregui/Models/GroupItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupItemController.cpp b/GUI/coregui/Models/GroupItemController.cpp
index 513d6bdcec67adc9b551159911813e570a698d5a..6ccc51d3db386c68ab6df22e4d9b420814427600 100644
--- a/GUI/coregui/Models/GroupItemController.cpp
+++ b/GUI/coregui/Models/GroupItemController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/GroupItemController.h b/GUI/coregui/Models/GroupItemController.h
index 29327affe9040ac8e05a37c9b39ad4901449f6ac..e5792b9b4e5f6206d0fe49d269e4f096be0f0568 100644
--- a/GUI/coregui/Models/GroupItemController.h
+++ b/GUI/coregui/Models/GroupItemController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InstrumentItem.cpp b/GUI/coregui/Models/InstrumentItem.cpp
index fc974c08f0900e17151e093d822f7613a9bf5a19..e9e596a286b31a4413fc552e13df5ba86c16a1e8 100644
--- a/GUI/coregui/Models/InstrumentItem.cpp
+++ b/GUI/coregui/Models/InstrumentItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InstrumentItem.h b/GUI/coregui/Models/InstrumentItem.h
index 2f2650cb05de86497c64ceb86310d2c2fbbdbca8..f9c8efcf74c4a70f8d915ad05fa7447a51172aad 100644
--- a/GUI/coregui/Models/InstrumentItem.h
+++ b/GUI/coregui/Models/InstrumentItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InstrumentModel.cpp b/GUI/coregui/Models/InstrumentModel.cpp
index d3cb3169fdc9ce216f23db8effa137393d9f02eb..bc8f72c6e2a95d292855fa2c99e5d391a34cfb2a 100644
--- a/GUI/coregui/Models/InstrumentModel.cpp
+++ b/GUI/coregui/Models/InstrumentModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InstrumentModel.h b/GUI/coregui/Models/InstrumentModel.h
index d5df3c9b4e6ca7ae755b4e3481eed13c822fab77..2ab882ba8b9fae9a9f5062f6a6f0ce0f87054800 100644
--- a/GUI/coregui/Models/InstrumentModel.h
+++ b/GUI/coregui/Models/InstrumentModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/IntensityDataItem.cpp b/GUI/coregui/Models/IntensityDataItem.cpp
index 133a718dd3b87214de327428f94e3a421e088fbe..da3341a9a70ac75d2aebfec2db99e168ae8003cd 100644
--- a/GUI/coregui/Models/IntensityDataItem.cpp
+++ b/GUI/coregui/Models/IntensityDataItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/IntensityDataItem.h b/GUI/coregui/Models/IntensityDataItem.h
index 2f2183b2e398b15056d6679d2a44292da8811ad2..0c8372630b910d3a624ddfc1ba2f612254c52953 100644
--- a/GUI/coregui/Models/IntensityDataItem.h
+++ b/GUI/coregui/Models/IntensityDataItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/IntensityDataItemUtils.cpp b/GUI/coregui/Models/IntensityDataItemUtils.cpp
index 75a4188f392850c1fb6e837ac97a4adc9251d8af..243438194639db187d6d6e859e8b035619b50a90 100644
--- a/GUI/coregui/Models/IntensityDataItemUtils.cpp
+++ b/GUI/coregui/Models/IntensityDataItemUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/IntensityDataItemUtils.h b/GUI/coregui/Models/IntensityDataItemUtils.h
index b3fae3318c5981d352ce91551853225a104369b9..00f7cb95d4c568249fcbbd83a830b13d007ad7a7 100644
--- a/GUI/coregui/Models/IntensityDataItemUtils.h
+++ b/GUI/coregui/Models/IntensityDataItemUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.cpp b/GUI/coregui/Models/InterferenceFunctionItems.cpp
index 138b88534f08b13203e05c93d809390c65ddd47b..a9ad1b0c1372f04d55d9df1533d2c2cd424bf272 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.cpp
+++ b/GUI/coregui/Models/InterferenceFunctionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/InterferenceFunctionItems.h b/GUI/coregui/Models/InterferenceFunctionItems.h
index 17a618113032dd5e8be61cf18019d97c984cfa8a..7abafb0ed735a11cfb0060cc0047d356ba8d55bf 100644
--- a/GUI/coregui/Models/InterferenceFunctionItems.h
+++ b/GUI/coregui/Models/InterferenceFunctionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index e899fffe08170e8f9cbb58bc99f69835d5d0f9b3..7191b23f449da7291403f9d3313402600ff0d10b 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ItemFactory.h b/GUI/coregui/Models/ItemFactory.h
index 747a408196ba78884e91f1fad9779719280c0780..7839b843c94f7b0b96713d63842e8d66ff863006 100644
--- a/GUI/coregui/Models/ItemFactory.h
+++ b/GUI/coregui/Models/ItemFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 5909b888b1a45c744a968527d23425792afcd4da..bd06b4c02cdd075b946fb24718fe57bfbd8ba1e0 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItem.h b/GUI/coregui/Models/JobItem.h
index 79f4fa866af40bd4e5fdb699e47f4bfbda30dcb3..f05c3c4dfed83701ab8d71df360c4def934edbe9 100644
--- a/GUI/coregui/Models/JobItem.h
+++ b/GUI/coregui/Models/JobItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItemFunctions.cpp b/GUI/coregui/Models/JobItemFunctions.cpp
index de3a8de1e5355a74455842265e755db12b72cc63..635f81c4b83b7edadb37c55013b269eb64332748 100644
--- a/GUI/coregui/Models/JobItemFunctions.cpp
+++ b/GUI/coregui/Models/JobItemFunctions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItemFunctions.h b/GUI/coregui/Models/JobItemFunctions.h
index c350ca16e9c97edd5fe2878b9d24cbd2ac9b0191..109d8c012045d865152384405724c8af36015deb 100644
--- a/GUI/coregui/Models/JobItemFunctions.h
+++ b/GUI/coregui/Models/JobItemFunctions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index a7b689e01f2444e08858509b08579ef49213895d..60ceb91a492ed6b80ee53675b4fde5c63ffb744e 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobItemUtils.h b/GUI/coregui/Models/JobItemUtils.h
index fc838bc6c5e4f72bce464bc0fb328312cc6e96cb..25a6f48916a029ee972019551e15dc8e9570cb87 100644
--- a/GUI/coregui/Models/JobItemUtils.h
+++ b/GUI/coregui/Models/JobItemUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index a29cd433854b9a598e08b17e33927d4be0cdd174..aec797b7f68da33bed8a137f3d4e87af4bbfd896 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobModel.h b/GUI/coregui/Models/JobModel.h
index a992a38977269ae6e40c601a5773301c5f88a448..c0f381acf3f4021758b40c51b28b28b37ca47e36 100644
--- a/GUI/coregui/Models/JobModel.h
+++ b/GUI/coregui/Models/JobModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 #ifndef JOBMODEL_H
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 41c043331d7da20e416ca52d4770ff132935d8ca..1c9b302f0acd6246b1ce03cf31020982eddc4837 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobModelFunctions.h b/GUI/coregui/Models/JobModelFunctions.h
index 3aa8da1d91c5b2fbf44a472165fffd73d2c6e42b..c1bd555084af6c24065ec876638e545b588eb865 100644
--- a/GUI/coregui/Models/JobModelFunctions.h
+++ b/GUI/coregui/Models/JobModelFunctions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobQueueData.cpp b/GUI/coregui/Models/JobQueueData.cpp
index 128334e74df58b09e552b77724183f6b87307013..65f8160a66ff72e4f3d23984ab181d9be7e3017d 100644
--- a/GUI/coregui/Models/JobQueueData.cpp
+++ b/GUI/coregui/Models/JobQueueData.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobQueueData.h b/GUI/coregui/Models/JobQueueData.h
index 5cebf0cc15c64a38ba09049f19a49d4794940b87..b9981824667ae1d83bfb32c07a16fd2453e747c1 100644
--- a/GUI/coregui/Models/JobQueueData.h
+++ b/GUI/coregui/Models/JobQueueData.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/coregui/Models/JobWorker.cpp
index 05ebb86f54de02fc18d8f3cbfa070f598289ed1c..27e2d18c3f7b16df5a7aba8814fcee1a3bc847e8 100644
--- a/GUI/coregui/Models/JobWorker.cpp
+++ b/GUI/coregui/Models/JobWorker.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/JobWorker.h b/GUI/coregui/Models/JobWorker.h
index 481e01b467aa1fb0bf2d1d11ac5abcafbb4c9e18..0b521661e3adebc5b07780f8c254ff568afea9de 100644
--- a/GUI/coregui/Models/JobWorker.h
+++ b/GUI/coregui/Models/JobWorker.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/Lattice2DItems.cpp b/GUI/coregui/Models/Lattice2DItems.cpp
index 471c393a0d5098e59f4ed046c792c85cfceff1ee..4fdd763660ed400a4970ae42702aa9a583735cb3 100644
--- a/GUI/coregui/Models/Lattice2DItems.cpp
+++ b/GUI/coregui/Models/Lattice2DItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/Lattice2DItems.h b/GUI/coregui/Models/Lattice2DItems.h
index 694ce9caa99b4f6da80042773806db838700f4e0..9d6ad2738d46eeb930f9d132fedacb3c4f2d610d 100644
--- a/GUI/coregui/Models/Lattice2DItems.h
+++ b/GUI/coregui/Models/Lattice2DItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LayerItem.cpp b/GUI/coregui/Models/LayerItem.cpp
index 4ae971cfc796741cf7681cd7a8f6ca6a0f0eb5b5..c77ad2dd650da9ab723e6d0e05eef6cddaf6c537 100644
--- a/GUI/coregui/Models/LayerItem.cpp
+++ b/GUI/coregui/Models/LayerItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LayerItem.h b/GUI/coregui/Models/LayerItem.h
index 38534d46a2f6446d87fdf776b9f5d7f2ef58d8d9..17abac58144cdd5005ac483a54db661632330daa 100644
--- a/GUI/coregui/Models/LayerItem.h
+++ b/GUI/coregui/Models/LayerItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LayerRoughnessItems.cpp b/GUI/coregui/Models/LayerRoughnessItems.cpp
index e673ab9827829268570ff5a0d56630ffc921a84b..afa981065793d418cc5d9b701c8eee616906a29c 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.cpp
+++ b/GUI/coregui/Models/LayerRoughnessItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LayerRoughnessItems.h b/GUI/coregui/Models/LayerRoughnessItems.h
index df22676910f3a776675c13e4baf97f8ec7a27965..f1751ea5c252f3565c9663dd62cd8606d64f1fdb 100644
--- a/GUI/coregui/Models/LayerRoughnessItems.h
+++ b/GUI/coregui/Models/LayerRoughnessItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LinkInstrumentItem.cpp b/GUI/coregui/Models/LinkInstrumentItem.cpp
index 9e0d41cda6a8dffa5e9868f2de4d24906b5c9ade..595807ef2456bba10df05f2f56156dd43268d691 100644
--- a/GUI/coregui/Models/LinkInstrumentItem.cpp
+++ b/GUI/coregui/Models/LinkInstrumentItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/LinkInstrumentItem.h b/GUI/coregui/Models/LinkInstrumentItem.h
index fbbf17ba6121730bcf61ee89601b345cd64c039a..ae54c1de6e4276b242b313156b5b2e35f49daa0b 100644
--- a/GUI/coregui/Models/LinkInstrumentItem.h
+++ b/GUI/coregui/Models/LinkInstrumentItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaskItems.cpp b/GUI/coregui/Models/MaskItems.cpp
index c82eff2e8f4017294b7299734a930554618a7971..784cf2c6c0f743e506efb62dca6f3b2727507f65 100644
--- a/GUI/coregui/Models/MaskItems.cpp
+++ b/GUI/coregui/Models/MaskItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaskItems.h b/GUI/coregui/Models/MaskItems.h
index 1e29cbf703290b80b3db190d3024a61148dbc10e..5ae71f869fe26874221eace8f5bacae54b023527 100644
--- a/GUI/coregui/Models/MaskItems.h
+++ b/GUI/coregui/Models/MaskItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialDataItem.cpp b/GUI/coregui/Models/MaterialDataItem.cpp
index e09f8771596fc16d2318903c086535256e07661f..63838da66ce3633e55cfa05e1f209b4624d0a693 100644
--- a/GUI/coregui/Models/MaterialDataItem.cpp
+++ b/GUI/coregui/Models/MaterialDataItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialDataItem.h b/GUI/coregui/Models/MaterialDataItem.h
index 436ba57412839b6c51e0a02b7eeb1fa80cb538ca..47043335bd84c8eb607d1dca98d3fb03242ed705 100644
--- a/GUI/coregui/Models/MaterialDataItem.h
+++ b/GUI/coregui/Models/MaterialDataItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 5db870c3ff9dfcb77be04db44ca0a697bfd6c88e..aeb7bf52763f4a7bcbd0daa72afba8a9fdb41057 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialItem.h b/GUI/coregui/Models/MaterialItem.h
index 7e8c2b7b05c579744bfc068bfd7df1682abce270..a1eaac304fe5662ad49b276fed5bae21fb90d3da 100644
--- a/GUI/coregui/Models/MaterialItem.h
+++ b/GUI/coregui/Models/MaterialItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 859f11912f731d578609cd4125b7a60f64af897c..143ae3849613a9fde7b45de5d1cba2643f07296b 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialModel.h b/GUI/coregui/Models/MaterialModel.h
index f7b1ed26dde07efc91b6e73c54d02ccb4ebecf42..6c61a4d042e0ce6ab333b33872866ec825920152 100644
--- a/GUI/coregui/Models/MaterialModel.h
+++ b/GUI/coregui/Models/MaterialModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialPropertyController.cpp b/GUI/coregui/Models/MaterialPropertyController.cpp
index 79d856d7e73fe72feb76a53c6e7843de301f542f..6cced2929454ede396f66ef37be6564ee67e7e3d 100644
--- a/GUI/coregui/Models/MaterialPropertyController.cpp
+++ b/GUI/coregui/Models/MaterialPropertyController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MaterialPropertyController.h b/GUI/coregui/Models/MaterialPropertyController.h
index 5e7b30325ebff25ae65d96aaedf4af380f3b57a1..8c52159045d3efe77adfebc7e8bc03004777c98c 100644
--- a/GUI/coregui/Models/MaterialPropertyController.h
+++ b/GUI/coregui/Models/MaterialPropertyController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MesoCrystalItem.cpp b/GUI/coregui/Models/MesoCrystalItem.cpp
index 0fa1f168b167bc574fde10d4592cdff8bfedac38..1c9f959679cedf71b7356d446d180b5fe4c62c3f 100644
--- a/GUI/coregui/Models/MesoCrystalItem.cpp
+++ b/GUI/coregui/Models/MesoCrystalItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke, Dmitry Yurov
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MesoCrystalItem.h b/GUI/coregui/Models/MesoCrystalItem.h
index 68feb5a70ead4d14c5193741e408a9f4ba4899c6..e33acd0184bcd777f4af5c5e48f375e5c5ef3a09 100644
--- a/GUI/coregui/Models/MesoCrystalItem.h
+++ b/GUI/coregui/Models/MesoCrystalItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke, Dmitry Yurov
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MinimizerItem.cpp b/GUI/coregui/Models/MinimizerItem.cpp
index 6d9e1fed3d937a20d1356f692ebff3254a497247..80555c23fb3cb4811e9ba8f62b58514cb6fa00d4 100644
--- a/GUI/coregui/Models/MinimizerItem.cpp
+++ b/GUI/coregui/Models/MinimizerItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MinimizerItem.h b/GUI/coregui/Models/MinimizerItem.h
index c1e35333c5427d8855daea0c2da954d5113d7402..9c919b5324658c330421b6b227a49b8638cc2c66 100644
--- a/GUI/coregui/Models/MinimizerItem.h
+++ b/GUI/coregui/Models/MinimizerItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.cpp b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
index 659a41922275ca1afcd403421cd0b7b30890b7bd..8233a82bdc0646952ac9728e343485c351a4a785 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.cpp
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MinimizerItemCatalogue.h b/GUI/coregui/Models/MinimizerItemCatalogue.h
index 351be2eaee19f4c8bc3368e707809c7b4744f6aa..af8cf90d7394b54ba31fd970374e5a64e41cbfe3 100644
--- a/GUI/coregui/Models/MinimizerItemCatalogue.h
+++ b/GUI/coregui/Models/MinimizerItemCatalogue.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelMapper.cpp b/GUI/coregui/Models/ModelMapper.cpp
index a6391e7c521073d2f96c89ed402ce6ddb9e49b7d..ed360d62b6687be7108b3fad52a5f4c8bf81bae2 100644
--- a/GUI/coregui/Models/ModelMapper.cpp
+++ b/GUI/coregui/Models/ModelMapper.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelMapper.h b/GUI/coregui/Models/ModelMapper.h
index f4c2fa89b6e428aa2923ee3a75c91c7be9365c39..75f0081282b8fa69ec1887f54654c6b7ac81aa0d 100644
--- a/GUI/coregui/Models/ModelMapper.h
+++ b/GUI/coregui/Models/ModelMapper.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/coregui/Models/ModelPath.cpp
index fca13b91ea12eb2c289aa0a7ade9022ee3d4766f..d6a585ab89de00b2b01206bedbb01719bd59c464 100644
--- a/GUI/coregui/Models/ModelPath.cpp
+++ b/GUI/coregui/Models/ModelPath.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelPath.h b/GUI/coregui/Models/ModelPath.h
index 1d071f654163e867b034d80cffa3bb55f70106f3..5ac83b8e6b100de559cd40ba0f97c8833c2682d9 100644
--- a/GUI/coregui/Models/ModelPath.h
+++ b/GUI/coregui/Models/ModelPath.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelUtils.cpp b/GUI/coregui/Models/ModelUtils.cpp
index eaf53ab916caf4d8f5dc02eb11245e56703993fc..01190acf9546f713bd1c8216a4564b0741fdaeb6 100644
--- a/GUI/coregui/Models/ModelUtils.cpp
+++ b/GUI/coregui/Models/ModelUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ModelUtils.h b/GUI/coregui/Models/ModelUtils.h
index ef9306dca274033f117f9ea21e38909d76cf9bea..6aa9919c87ce6f78b21d1cacd190e5792b2d4600 100644
--- a/GUI/coregui/Models/ModelUtils.h
+++ b/GUI/coregui/Models/ModelUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MultiLayerItem.cpp b/GUI/coregui/Models/MultiLayerItem.cpp
index ba8c5365c7ae30298f7f41373dd4e796bf189708..3728dbf147623e8fc54be5ca6f5aa5ff3fae823b 100644
--- a/GUI/coregui/Models/MultiLayerItem.cpp
+++ b/GUI/coregui/Models/MultiLayerItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/MultiLayerItem.h b/GUI/coregui/Models/MultiLayerItem.h
index 8cb840f69e9f8d143a41c3c3a49ca8ef3a7854c4..22e0906b647b3196699a5988c23599f615c6edbe 100644
--- a/GUI/coregui/Models/MultiLayerItem.h
+++ b/GUI/coregui/Models/MultiLayerItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTranslators.cpp b/GUI/coregui/Models/ParameterTranslators.cpp
index f16b25146a16277e3a8ee6b5edc9f280a374ca03..5413d34d5f937af2f8a525a79601ef102e43ad86 100644
--- a/GUI/coregui/Models/ParameterTranslators.cpp
+++ b/GUI/coregui/Models/ParameterTranslators.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTranslators.h b/GUI/coregui/Models/ParameterTranslators.h
index 42444bef53b3a4bb90bdbda2de8c9fa73782c137..6331bd14dbfa5a960ea229cabdaf96fe83c6e2d9 100644
--- a/GUI/coregui/Models/ParameterTranslators.h
+++ b/GUI/coregui/Models/ParameterTranslators.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2015
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   C. Durniak, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTreeItems.cpp b/GUI/coregui/Models/ParameterTreeItems.cpp
index bed24add55fc4d5412743d634a00f9dc773aebb8..8a0495bd0e4b4309228bfd15e20aa6f2b69296c1 100644
--- a/GUI/coregui/Models/ParameterTreeItems.cpp
+++ b/GUI/coregui/Models/ParameterTreeItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTreeItems.h b/GUI/coregui/Models/ParameterTreeItems.h
index edd39eec7c3fc9cdfec9e8769e445a842e55c0a1..3981df38da16869cf54bb99c774a781ca262bac3 100644
--- a/GUI/coregui/Models/ParameterTreeItems.h
+++ b/GUI/coregui/Models/ParameterTreeItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTreeUtils.cpp b/GUI/coregui/Models/ParameterTreeUtils.cpp
index 80f9038f011617df97456afeb73aacd889c0ec8f..079197f256bed7a374f3427146be13d37cd0dd90 100644
--- a/GUI/coregui/Models/ParameterTreeUtils.cpp
+++ b/GUI/coregui/Models/ParameterTreeUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTreeUtils.h b/GUI/coregui/Models/ParameterTreeUtils.h
index 281a8b0b859b69809f4a1d7cacb74ecaaef600c2..f54d342d7d41e6b9b1f2455cd1424206a932c17d 100644
--- a/GUI/coregui/Models/ParameterTreeUtils.h
+++ b/GUI/coregui/Models/ParameterTreeUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index cdca594b9bf8ead64b127bfa8401ff5f22b44067..a3083e0f50a90cd4ea834b498909a47ac280b2cf 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParameterTuningModel.h b/GUI/coregui/Models/ParameterTuningModel.h
index eeeb3424c55258893469438e20576ca0534cf931..0c70d629be818c4b701a3c6b9740f106a246250c 100644
--- a/GUI/coregui/Models/ParameterTuningModel.h
+++ b/GUI/coregui/Models/ParameterTuningModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleCompositionItem.cpp b/GUI/coregui/Models/ParticleCompositionItem.cpp
index 57209f5be5a2ffa7b0c04f5b454b1b305f9ce3ed..61cb50f73898e04430659c3e3c6a65fd65e835c8 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.cpp
+++ b/GUI/coregui/Models/ParticleCompositionItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleCompositionItem.h b/GUI/coregui/Models/ParticleCompositionItem.h
index 4d059236d9e857524cbee7f47e7852d339a36d62..dd95d4e34354f3baec04b6bd7d988579932e1ad3 100644
--- a/GUI/coregui/Models/ParticleCompositionItem.h
+++ b/GUI/coregui/Models/ParticleCompositionItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.cpp b/GUI/coregui/Models/ParticleCoreShellItem.cpp
index fc5798f76e1a0974d3ba2aaedf46d8810a0a17b0..39deb9832376519f0ac3f4764b4cd9c68640e571 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.cpp
+++ b/GUI/coregui/Models/ParticleCoreShellItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleCoreShellItem.h b/GUI/coregui/Models/ParticleCoreShellItem.h
index e22ab615981f9a53de6801d3689fb7197869d043..64f41e4ff55b2204467ebdc56605b9535d514a34 100644
--- a/GUI/coregui/Models/ParticleCoreShellItem.h
+++ b/GUI/coregui/Models/ParticleCoreShellItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleDistributionItem.cpp b/GUI/coregui/Models/ParticleDistributionItem.cpp
index d73c6008dc8d0f4990294dd703c8811dc11c3ad5..61983b483dc5525584e21ef03b07693e94d5f92a 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.cpp
+++ b/GUI/coregui/Models/ParticleDistributionItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleDistributionItem.h b/GUI/coregui/Models/ParticleDistributionItem.h
index 4170ec3dd08bef04610134f7711fd4813550ca0d..ac9d80993feafdedd26488437635e93b7b816bee 100644
--- a/GUI/coregui/Models/ParticleDistributionItem.h
+++ b/GUI/coregui/Models/ParticleDistributionItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleItem.cpp b/GUI/coregui/Models/ParticleItem.cpp
index 27c9e4ad262858a4675a863fd904e17eeb832100..c09477766c51e96e439a6fc2f7809b6260e89d1c 100644
--- a/GUI/coregui/Models/ParticleItem.cpp
+++ b/GUI/coregui/Models/ParticleItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleItem.h b/GUI/coregui/Models/ParticleItem.h
index f7c19c0a2f62a0f950b348801e09110cc8f3f4b4..be554ab766890d7d551eeea75afbc305dd414d09 100644
--- a/GUI/coregui/Models/ParticleItem.h
+++ b/GUI/coregui/Models/ParticleItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleLayoutItem.cpp b/GUI/coregui/Models/ParticleLayoutItem.cpp
index 706c269a0ab11bf1998a29bef4ea020bf7905453..1a6b52dc2a5b04c449d678a02ed9fd45833a23a8 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.cpp
+++ b/GUI/coregui/Models/ParticleLayoutItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ParticleLayoutItem.h b/GUI/coregui/Models/ParticleLayoutItem.h
index d28baf5c06ef49e1a530e5031cf4e99f848e6562..cd51292378c193f87a6e494493831351e8a90045 100644
--- a/GUI/coregui/Models/ParticleLayoutItem.h
+++ b/GUI/coregui/Models/ParticleLayoutItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ProjectionItems.cpp b/GUI/coregui/Models/ProjectionItems.cpp
index 4eccf1c3e78767b45b84e768ee17f85181313758..8cdd698246f8b34ffeef0a4ffc2ba0ec589828ce 100644
--- a/GUI/coregui/Models/ProjectionItems.cpp
+++ b/GUI/coregui/Models/ProjectionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ProjectionItems.h b/GUI/coregui/Models/ProjectionItems.h
index 4c844b8a12cfe121ba854e709b613e4ebd084ac9..2a5ca71487c13644c87a0ae77ce1a56fafe2d8ae 100644
--- a/GUI/coregui/Models/ProjectionItems.h
+++ b/GUI/coregui/Models/ProjectionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/PropertyItem.cpp b/GUI/coregui/Models/PropertyItem.cpp
index 8c9f801ab161081c8f1a8929efad54db6aeb30cd..afbf522b8380c37d537eb0a961cb43d79b784ec9 100644
--- a/GUI/coregui/Models/PropertyItem.cpp
+++ b/GUI/coregui/Models/PropertyItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/PropertyItem.h b/GUI/coregui/Models/PropertyItem.h
index 2978f4ff6a39ac0e3e9209f31e234212fdd6dde8..b9785d3462df38ec9154081cf07fef525ad41712 100644
--- a/GUI/coregui/Models/PropertyItem.h
+++ b/GUI/coregui/Models/PropertyItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ProxyModelStrategy.cpp b/GUI/coregui/Models/ProxyModelStrategy.cpp
index 6c51c22cc1785a7d823fa15fbf5b1d26c439a158..43fe290517c2033c4da03112c42161b17c82a160 100644
--- a/GUI/coregui/Models/ProxyModelStrategy.cpp
+++ b/GUI/coregui/Models/ProxyModelStrategy.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ProxyModelStrategy.h b/GUI/coregui/Models/ProxyModelStrategy.h
index a6750eadf2d31501c0faa5c8ceab62ff8bcdfe6f..37a0ea85b126afecbd3d6a8592ee3e0d5084d209 100644
--- a/GUI/coregui/Models/ProxyModelStrategy.h
+++ b/GUI/coregui/Models/ProxyModelStrategy.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 5cef412988970d5fa6cc6f4482e6d8ee22832354..b7a2d998a6cc29ae379e00a6aa212b171be66b6a 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealDataItem.h b/GUI/coregui/Models/RealDataItem.h
index 802b0ba6aebe532bdc4facc74d4c7c94f36b9937..21764eda1545696774eb8a85be93901852c9da9f 100644
--- a/GUI/coregui/Models/RealDataItem.h
+++ b/GUI/coregui/Models/RealDataItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealDataModel.cpp b/GUI/coregui/Models/RealDataModel.cpp
index 0a36390b98317c47ee31f98c00224ef247e87ecf..f5d3509bc66e13b901735fc3c94d7f7ed388b172 100644
--- a/GUI/coregui/Models/RealDataModel.cpp
+++ b/GUI/coregui/Models/RealDataModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealDataModel.h b/GUI/coregui/Models/RealDataModel.h
index 12bc0f909e218c47745ec3f41599ac8f094c1310..d1e9b2a6958b98a1cd4e9919b15b8cdeb10b965b 100644
--- a/GUI/coregui/Models/RealDataModel.h
+++ b/GUI/coregui/Models/RealDataModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealLimitsItems.cpp b/GUI/coregui/Models/RealLimitsItems.cpp
index 37e35de286fa8fc4090eac9e4a7806e335b7a6e5..da729016e52c3fcfea6fc9f9350937d63c238de9 100644
--- a/GUI/coregui/Models/RealLimitsItems.cpp
+++ b/GUI/coregui/Models/RealLimitsItems.cpp
@@ -1,3 +1,4 @@
+// ************************************************************************** //
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
@@ -6,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RealLimitsItems.h b/GUI/coregui/Models/RealLimitsItems.h
index 22475bc4157e3a9bf63c61368793fb9882cda081..2a735287dea84c2fdfc809d4ee6fd6ecd5e3b62d 100644
--- a/GUI/coregui/Models/RealLimitsItems.h
+++ b/GUI/coregui/Models/RealLimitsItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RectangularDetectorItem.cpp b/GUI/coregui/Models/RectangularDetectorItem.cpp
index bbf88a91277e25a64e0aefd2ae9c58454cc7297f..46142b6163ff2883fd8bb5b1cd66b43a5cee1b2c 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.cpp
+++ b/GUI/coregui/Models/RectangularDetectorItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RectangularDetectorItem.h b/GUI/coregui/Models/RectangularDetectorItem.h
index dca254d076da0ad59b108f4b95f9313b47a722db..56300e389e9b3a81ad62096892ce8e0f0c18faf8 100644
--- a/GUI/coregui/Models/RectangularDetectorItem.h
+++ b/GUI/coregui/Models/RectangularDetectorItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.cpp b/GUI/coregui/Models/ResolutionFunctionItems.cpp
index da7e2605aba0e39045874bdfeca7ded1922d072b..19dbd70f0dd9e26918f5ad25d74cd1c402f8cefd 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.cpp
+++ b/GUI/coregui/Models/ResolutionFunctionItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/ResolutionFunctionItems.h b/GUI/coregui/Models/ResolutionFunctionItems.h
index cb3a2943a1775442c2d93082fedd4f077b672181..cf89d3f288fd19e1744850a755b04e345ba5d806 100644
--- a/GUI/coregui/Models/ResolutionFunctionItems.h
+++ b/GUI/coregui/Models/ResolutionFunctionItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RotationItems.cpp b/GUI/coregui/Models/RotationItems.cpp
index a785b2432203935e95d66817ff5efacce73cd6c6..c43dbc7f2d4d837bf257fbc55e5d0374ac9f8a26 100644
--- a/GUI/coregui/Models/RotationItems.cpp
+++ b/GUI/coregui/Models/RotationItems.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/RotationItems.h b/GUI/coregui/Models/RotationItems.h
index 0417d8752344af3c343573708acfc344291f6d52..ec19fc41d60f02148fb0780036a5a5cbf0bcb623 100644
--- a/GUI/coregui/Models/RotationItems.h
+++ b/GUI/coregui/Models/RotationItems.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -31,7 +29,7 @@ public:
 
 class BA_CORE_API_ XRotationItem : public RotationItem
 {
-public:   
+public:
     static const QString P_ANGLE;
     XRotationItem();
     std::unique_ptr<IRotation> createRotation() const;
diff --git a/GUI/coregui/Models/SampleModel.cpp b/GUI/coregui/Models/SampleModel.cpp
index 5b1d7ac54eb903bf70d196ee0af4c6e90b0f0a39..404ba998f40bbdbd8fb407bae68a7c43040728ca 100644
--- a/GUI/coregui/Models/SampleModel.cpp
+++ b/GUI/coregui/Models/SampleModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SampleModel.h b/GUI/coregui/Models/SampleModel.h
index 6998d21c1d1d5bcd46c6a4c5b31173cf919eb88c..5a871985d89f106a9ee24a6309dc0781aec9513a 100644
--- a/GUI/coregui/Models/SampleModel.h
+++ b/GUI/coregui/Models/SampleModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/coregui/Models/SampleValidator.cpp
index 5fb1fef37c7328bb82cfc7d9262c7de21e31160b..79ec200960fcc8101c52bc9af323ff1d49f1699b 100644
--- a/GUI/coregui/Models/SampleValidator.cpp
+++ b/GUI/coregui/Models/SampleValidator.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SampleValidator.h b/GUI/coregui/Models/SampleValidator.h
index 01a3a716624c24195d794d81ee1d041f2d6fa81d..adacd9b3364e50c840b4c0c47a9581a709a2516a 100644
--- a/GUI/coregui/Models/SampleValidator.h
+++ b/GUI/coregui/Models/SampleValidator.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionDecorationModel.cpp b/GUI/coregui/Models/SessionDecorationModel.cpp
index 1018067c8eecd060b2b728c0f750aeb0b7a8a0db..98e89c3b510a91794795e1144473f0c3d5fdad31 100644
--- a/GUI/coregui/Models/SessionDecorationModel.cpp
+++ b/GUI/coregui/Models/SessionDecorationModel.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionDecorationModel.h b/GUI/coregui/Models/SessionDecorationModel.h
index 1b0c52d8af4475072a31271bcffdccfb11a1bc73..3b5247e3a9780b501e9e5cf697d0b5aa23ff2585 100644
--- a/GUI/coregui/Models/SessionDecorationModel.h
+++ b/GUI/coregui/Models/SessionDecorationModel.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionFlags.h b/GUI/coregui/Models/SessionFlags.h
index 81d1deced4fd635b5e5ad2642fd4cdc0e4acdb81..894f60a1cafd54f4997e380f17eb744a11efdca9 100644
--- a/GUI/coregui/Models/SessionFlags.h
+++ b/GUI/coregui/Models/SessionFlags.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionGraphicsItem.cpp b/GUI/coregui/Models/SessionGraphicsItem.cpp
index 42f15bf6c43f9a63aad4a26c31aa5c22280226b9..be35121a276724c5a4c501c07d56f6777480fb1d 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.cpp
+++ b/GUI/coregui/Models/SessionGraphicsItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/coregui/Models/SessionGraphicsItem.h
index 845b37a96d03995fd1517a03ab86478c9551ba94..82f6e668c5f1d58ff6ae60b1bc4d4436b7837e19 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.h
+++ b/GUI/coregui/Models/SessionGraphicsItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItem.cpp b/GUI/coregui/Models/SessionItem.cpp
index a2e504967240733d50e86b3c6858cc015308439d..d695e5f4ad5ebbd7079c870a83394c46e392fc6a 100644
--- a/GUI/coregui/Models/SessionItem.cpp
+++ b/GUI/coregui/Models/SessionItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index aa5690fc94057b35f007c6fef8655ee5aaa83163..3a86bef96f0a8d2001d84d7452025f3abd251586 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemData.cpp b/GUI/coregui/Models/SessionItemData.cpp
index 02ffbdd670e8e0bf8f8cd72c58feee12d8c827be..8aad96508745d375b997eb23dce0c70021c843e7 100644
--- a/GUI/coregui/Models/SessionItemData.cpp
+++ b/GUI/coregui/Models/SessionItemData.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemData.h b/GUI/coregui/Models/SessionItemData.h
index cdcf927e6234fc5b2f18aae59ea84ef07056e1a4..661fefb3869b3f4ea17a843ac792106f78c1febc 100644
--- a/GUI/coregui/Models/SessionItemData.h
+++ b/GUI/coregui/Models/SessionItemData.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemTags.cpp b/GUI/coregui/Models/SessionItemTags.cpp
index a05fe239e0566837c67d9faa5b079577fa029ba5..88e02fc4c0bb5994ecb0d536becc1b14e9b8118f 100644
--- a/GUI/coregui/Models/SessionItemTags.cpp
+++ b/GUI/coregui/Models/SessionItemTags.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemTags.h b/GUI/coregui/Models/SessionItemTags.h
index 1ea6f1e2254911599a4963cc3ff4510a18ae267d..f5e3c016257fd97d691e7343125086ceda66538e 100644
--- a/GUI/coregui/Models/SessionItemTags.h
+++ b/GUI/coregui/Models/SessionItemTags.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemUtils.cpp b/GUI/coregui/Models/SessionItemUtils.cpp
index 0d83cd034117e4c7c66cda45b7a745e1bae68b0d..7a8c0e670657bace9b227020b43663010391ad3d 100644
--- a/GUI/coregui/Models/SessionItemUtils.cpp
+++ b/GUI/coregui/Models/SessionItemUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke, Dmitry Yurov
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionItemUtils.h b/GUI/coregui/Models/SessionItemUtils.h
index c1a7b7f1c69d9fcbffb4bbd9ada4cb8827c229f9..0043f84c614866e64a78c8287e93577f26de27fa 100644
--- a/GUI/coregui/Models/SessionItemUtils.h
+++ b/GUI/coregui/Models/SessionItemUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke, Dmitry Yurov
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index c1571ae0d617fa4fd6021d98aaeada5f867fa2b0..caefc0c252e3ef05acdbc2669c85ce1ad27088d8 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index 96cbbf45070fc850a98d125af4aeaf82c7e11390..c7cf8ccf47ea4209ab55e231565668b011be253e 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionModelDelegate.cpp b/GUI/coregui/Models/SessionModelDelegate.cpp
index 87f27f2f976f0071b05349c2c2f63f4748512223..7ee4f6607629fc0bdadea42f26266792773c3b16 100644
--- a/GUI/coregui/Models/SessionModelDelegate.cpp
+++ b/GUI/coregui/Models/SessionModelDelegate.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionModelDelegate.h b/GUI/coregui/Models/SessionModelDelegate.h
index 82f68d149ae6954e13b3244bbbcb400a5c73f2fc..2bf1151a067aa3e1f341de8c86129d558c34e263 100644
--- a/GUI/coregui/Models/SessionModelDelegate.h
+++ b/GUI/coregui/Models/SessionModelDelegate.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionXML.cpp b/GUI/coregui/Models/SessionXML.cpp
index 5a38592ff9d85463bed9a2fdd43f2039e4a3d4f7..7b9a936bd48a40822062de850eb6b48dd89011fe 100644
--- a/GUI/coregui/Models/SessionXML.cpp
+++ b/GUI/coregui/Models/SessionXML.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index 4c4e4fc2d34856f98df1e264bb7f18270db66fab..424dba6884c53d601e793b89ae78caa9e333ca00 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SimulationOptionsItem.cpp b/GUI/coregui/Models/SimulationOptionsItem.cpp
index bdad10fd29b8a3e8e7529e2589ed308c4b865c25..b79fdb2f18c9c08305e4b7fee9a33dd721ff821f 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.cpp
+++ b/GUI/coregui/Models/SimulationOptionsItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SimulationOptionsItem.h b/GUI/coregui/Models/SimulationOptionsItem.h
index f61522f7aa2f9b3255b1414734f8ae0ca11e7b3c..5d78df4e6b1f19fdf3e813f8c74f0e6e071b1925 100644
--- a/GUI/coregui/Models/SimulationOptionsItem.h
+++ b/GUI/coregui/Models/SimulationOptionsItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SphericalDetectorItem.cpp b/GUI/coregui/Models/SphericalDetectorItem.cpp
index 7256d9b569656929394071dfa6488c9d80397110..8f562978ea67a1f89f0aec70a8a37497a5a227fb 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.cpp
+++ b/GUI/coregui/Models/SphericalDetectorItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/SphericalDetectorItem.h b/GUI/coregui/Models/SphericalDetectorItem.h
index 2185ca01489a6dcc3223cca376145e3a0cfc4a7b..be0bd1415ec2f6f6d31875a0030d9be9f21370cc 100644
--- a/GUI/coregui/Models/SphericalDetectorItem.h
+++ b/GUI/coregui/Models/SphericalDetectorItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index e57a9e374035c1b8259dffc5867a1d0c1bc9ccd6..006547b2be2260f7dc335de66aa62f222c5c599e 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformFromDomain.h b/GUI/coregui/Models/TransformFromDomain.h
index 8da74ed6119a066d5d0c1c3deedba312203a25d5..2e28b704862c2aeb118d75aed0a05ae77175f5ea 100644
--- a/GUI/coregui/Models/TransformFromDomain.h
+++ b/GUI/coregui/Models/TransformFromDomain.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformToDomain.cpp b/GUI/coregui/Models/TransformToDomain.cpp
index 5a44f6f19d8c80a258c2bf7be8608a722732fd00..9f88b875474dbc4c3bab78fa7c8be9c2c480626d 100644
--- a/GUI/coregui/Models/TransformToDomain.cpp
+++ b/GUI/coregui/Models/TransformToDomain.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformToDomain.h b/GUI/coregui/Models/TransformToDomain.h
index 2c1bc2a4393b2d2c89acd6dbd14987bee278a07d..aba58be3e1e3f42398b219e9fb6b2f7e2a12eb85 100644
--- a/GUI/coregui/Models/TransformToDomain.h
+++ b/GUI/coregui/Models/TransformToDomain.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformationItem.cpp b/GUI/coregui/Models/TransformationItem.cpp
index d76389c8d62ce4de38f22c314993655e036afec4..e9c7d936b849ab715735ae4b047dedf6f97fe144 100644
--- a/GUI/coregui/Models/TransformationItem.cpp
+++ b/GUI/coregui/Models/TransformationItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/TransformationItem.h b/GUI/coregui/Models/TransformationItem.h
index 33d104094873cb9372aa71aec84253147480a728..141cf7e1b3c98d825aaffb0dfce538d5bfce8837 100644
--- a/GUI/coregui/Models/TransformationItem.h
+++ b/GUI/coregui/Models/TransformationItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/VectorItem.cpp b/GUI/coregui/Models/VectorItem.cpp
index ebb536802a6735b1a76a44cba357212d6e91568c..3b04d3eb3ee8cd3de24b454fabdc4601146e4e88 100644
--- a/GUI/coregui/Models/VectorItem.cpp
+++ b/GUI/coregui/Models/VectorItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/VectorItem.h b/GUI/coregui/Models/VectorItem.h
index 3b396654014e0d8a4e66f5b5c23de348bd3fc099..413f524c3655a6fbf77dbfe3948f37dbe88e3e30 100644
--- a/GUI/coregui/Models/VectorItem.h
+++ b/GUI/coregui/Models/VectorItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h
index c603af6f79c5b821933baa157a4482d1d5d16f39..dbb28d52309e07238de165c3fae7a3be0b75efab 100644
--- a/GUI/coregui/Models/item_constants.h
+++ b/GUI/coregui/Models/item_constants.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
index d0b8af5c3beb811ce76786b42ea9db3943243d39..2f194d52bb3b68c8a10daf8d53ec8cc410cb365f 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
index 27ab77db5c4dae97e9d4336c17463f68f02387a2..befac390451895e863cd7b40b94821f45c3a791d 100644
--- a/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
+++ b/GUI/coregui/Views/AccordionWidget/AccordionWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
index 32ec42064683ac4376890f0804e60065c715f44c..f8c074a0580667a94bcdbdafd1c96a6a678cb8b0 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
index 132b5eb94c08ef0247acc719080e68f4c1e0f79c..4ed6d2ddb9151ebf7853c537a6f7caa7301848ba 100644
--- a/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
+++ b/GUI/coregui/Views/AccordionWidget/ClickableFrame.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
index acb79052cf32fa35d0f7f8dd22ec21463b9ed50d..99d8ae9194b296863d2ca29ebef5ecc008d0c82e 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/AccordionWidget/ContentPane.h b/GUI/coregui/Views/AccordionWidget/ContentPane.h
index b64ec65913c38c5b3a9ccf55b114d8800d152a1b..aed794ae4f1dcb4dd509469486cc70b72535dbcd 100644
--- a/GUI/coregui/Views/AccordionWidget/ContentPane.h
+++ b/GUI/coregui/Views/AccordionWidget/ContentPane.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp
index 50a49908f974bcfd17fb75cf352703064e547cf0..3c1d421c89e072f0ea359362682ad2c3d5f65b74 100644
--- a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp
+++ b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
index c8357d0fa57345bec80cd452591bc6790a181522..164a027c5e3f40cc8fdaad14b451bfdd6e808f87 100644
--- a/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
+++ b/GUI/coregui/Views/CommonWidgets/AdjustingScrollArea.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp b/GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp
index a33e900b02fca41dae41492400adf5940b218470..e32c29d2ae54a6245a47502c86a0228cd9c17922 100644
--- a/GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ColumnResizer.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ColumnResizer.h b/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
index 0054dd6d41b6a8f51f44392829459b195a5f8c97..3688cefed1dad0a939e4f3434ed38db823c14f65 100644
--- a/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
+++ b/GUI/coregui/Views/CommonWidgets/ColumnResizer.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
index 01ec7b0f8811f7291a7a8350a010aa7824dae1b3..d44454655d63b45509745739468d0836f9228b6d 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanel.h b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
index cbdd1314017756bdbba5b8959fad511b614f8c6d..fce926c13f5d090617775877be83ca1809ad9813 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanel.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
index cd05425457a5f95b6c33ab5428acddbd322fb355..04582bcdc239cb9db0eb6dcbafa5c9916db6e861 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
index 8849442bcac552bb73480977f58007567f479ecc..57888e6ef9b2f6b777cc6370014b35a737e586bb 100644
--- a/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/InfoPanelToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
index 13c70687c2e39c3350e5f9dfa16e0af0949dff8a..1ff28b01e0d529e5a442166a46249b1e2cc3ddcb 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
index 943201a7c323dc260969a9821897defb9fc41e93..fcc259771b51d606367b3b3f341bddb038dc95dd 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
index f25d9ae93753450cb066aee8fe39428b5c4678be..2c0d5d936be76c2a8670465211717ca2cc3d8f8f 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
index 8f2056d47166b28178c2552c802b09109666c58c..53854ff4a4c9429a08de6c39c2aeaf7afcd8c554 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemComboWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
index b09f2696c4ed0f1b716dd5086a094c930cbbc3f4..e66adbb7c981cf8e3346e7f6f1469e33f980ec1d 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
index e9e4476a35f763ec77195f8c687f2a66f4a0e75d..b11119f5c27da3e986b9c16e88c349cef82eb0a5 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemSelectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
index cf9b999cfe3496b43361517c49893acb20ef7266..02fc8b59c67889b0357cd7a0c1d0741aeef70dc7 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackPresenter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
index 4c299a8938ef3885bf7df5905be54450f3b19d77..3edb4428e0b78ddb42143fb559f66f1119e92033 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
index 01569ce1f2039e47c8f56de135c5ca1bdd304dce..d86b8aae43668458c83deaf1cc2d15d31944e14d 100644
--- a/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/ItemStackWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp b/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
index 42727e7fa5df77ea851a613070007843045a4e9c..8db8348562a7b4ff87e2b094e91a0418f44e12fa 100644
--- a/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
+++ b/GUI/coregui/Views/CommonWidgets/ModelTreeView.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/ModelTreeView.h b/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
index 18edf847ecfe5f78ed695eccbe496f5b030cc8b4..e5e6a939374c7e8075b7f722d98925a9f5b7110c 100644
--- a/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
+++ b/GUI/coregui/Views/CommonWidgets/ModelTreeView.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp b/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
index d38de4b29c5a058c7dac0cdc515e9492c268fb56..6dff59ee1bfae8d5c85bf0a05651a4e698c24d1f 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemController.h b/GUI/coregui/Views/CommonWidgets/SessionItemController.h
index 9f3fe18a9d481b6dbacffdb5a577c3dbf1cd40e1..d3057fc29d5aeac47b4e6a1c3687bbf9c744de0f 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemController.h
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp
index a9a05eb7e29706b78b9d8ca95a31a79ad4188931..8a22cd434615ca6adcec3a312607baedada5160d 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
index 491bfe9217aaeeaeeaab570cd28cedb2ec04ac40..a2cf1334d3fcf8c770aa3d5e3fe744cfc76131a7 100644
--- a/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
+++ b/GUI/coregui/Views/CommonWidgets/SessionItemWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
index cb069ce8cd8201b9fe1d99dd56e76d925548ee39..eb3354009ab2c05020b72a1614256a0ce3a45232 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/StatusLabel.h b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
index 616238cc7e0166426a288be318401c7832bd2318..0e92d5128f78b2b90daa6dc7b91909d66b96ccad 100644
--- a/GUI/coregui/Views/CommonWidgets/StatusLabel.h
+++ b/GUI/coregui/Views/CommonWidgets/StatusLabel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
index 13d09d6c5343101302c96f732f6378fcc57a3be2..df987534248b548ddef0b1c38437ebc2ec318999 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
index a87f53ca8ac2c0fec9a30205427a692ee314476b..8e042dd47873e8de7aa1e969cc970bb4a89bbdc0 100644
--- a/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
+++ b/GUI/coregui/Views/CommonWidgets/UpdateTimer.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
index a59b54f6c83b6790de900abf0cd106278d252aef..bd907c284275547353d3de7b4645f04356c07444 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
index 766a2e2d9113d2f3e404e20945cb9ad19ee8e670..f41ecd14b5329dbf473f93683842346fdb792082 100644
--- a/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
+++ b/GUI/coregui/Views/FitWidgets/FitActivityPanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
index e27e73a161efef16ec42d0dd545dfd4ce34c4410..4278e2b28b68c4d7df5790a4825797706bdf98a4 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonController.h b/GUI/coregui/Views/FitWidgets/FitComparisonController.h
index 66d983b43d9a94f0fcd76aff8f50c11f8b436e78..ebf901937085d610cb8d50297a9c23a82c513d4f 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonController.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index 44e29a02309e22c06ed0d3f5b741e7f3ec3bca38..5ce867028ca7bc3ab4df904011db08120867650f 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
index 0c7c5d56ff96a9c04b2adce7fc8d3b6c6e4ca267..3684c900e64cd7a8ffd56f96a60f217446ed513e 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
index 644f463644dc0e8c0107e3053ab42b0a19756d17..7c71e14c5f509b05dc5fc2b1e1138377ca34abf9 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
index 4c8d3fbf6e893dd1a8a69b59da31d1c01f9fd6c9..978a0ed3dbcfaf33def137b017021614e651926c 100644
--- a/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitFlowWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitLog.cpp b/GUI/coregui/Views/FitWidgets/FitLog.cpp
index a39cd45e7de729fa7207f2c566b7a0d97c67a446..b8207af15366f4b259146ec3e00dbdde64c207fb 100644
--- a/GUI/coregui/Views/FitWidgets/FitLog.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitLog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitLog.h b/GUI/coregui/Views/FitWidgets/FitLog.h
index ca173a0c1e0ae139373a89b11a32f04ef41a89bf..4b5de49d1fa778ba117ae218b9d4406e2fc8de55 100644
--- a/GUI/coregui/Views/FitWidgets/FitLog.h
+++ b/GUI/coregui/Views/FitWidgets/FitLog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitLogFlags.cpp b/GUI/coregui/Views/FitWidgets/FitLogFlags.cpp
index 5eaba8c2356619de0dea772c3b0d96afbc8a1449..58c4a883784e2dbf7f921cd1bb5aa745a2a813b3 100644
--- a/GUI/coregui/Views/FitWidgets/FitLogFlags.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitLogFlags.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitLogFlags.h b/GUI/coregui/Views/FitWidgets/FitLogFlags.h
index 37198160e4b5d64218ff0c99622a2d05e21be5e1..0f716ae6b780176f5653b71ca4cc646b4676d94b 100644
--- a/GUI/coregui/Views/FitWidgets/FitLogFlags.h
+++ b/GUI/coregui/Views/FitWidgets/FitLogFlags.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index 1ef4c24184a93fb0fc8df8f2c89d4180ecae5ba2..280844f21ba862e77fa830444d3e2f9f0dcc953b 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
index 611e242530d1eb893ebebde1b074943332767367..52167313cbb60bdca5b316f5d9479bc1c0094d03 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp b/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
index 2be13c32eef5fee75ad2a99ef10c49b4c0238cea..157242bcf14fd4c4a1b172e0ed991253b941aa13 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
index 388e0ff2259cb5f9b24b58bdba2f249d88e39822..d8d8a9f36370dd24d3e098c65e8bb9fbdd9487f7 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
+++ b/GUI/coregui/Views/FitWidgets/FitProgressInfo.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp b/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
index 5b1142debf0176d6a88b4e4487e1864630b4d86e..125897b2138dc46ae31a8aaa635bbd50c05718a1 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
index 233c9fb4a09f3d0ae5b8d6393ef72637b9bbfd40..23bee81e0225ab68d8db1dafc9067fa8096e640e 100644
--- a/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitResultsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
index d7b7202ed52bb37b7c8bbb37792906d6a193a0ee..474eda2c7d863dbc0d12dbbfc584587d581268dc 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionController.h b/GUI/coregui/Views/FitWidgets/FitSessionController.h
index e1a5d2c92cf2ffe52525044529c041f01725ae15..a17858b9a10f4e326c8b591d65604f3f7b6312ed 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionController.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp b/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
index 8bbc0615fe6934f2e452a36b79a168a999731929..7720c818d90142799c4f9449112fabe4e0e69bcd 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionManager.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionManager.h b/GUI/coregui/Views/FitWidgets/FitSessionManager.h
index 6150686d3ccb08938ea7790c6f5fbec45107122f..74cc0b71932ef648d29d24e95e84c9e98db0f6b9 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionManager.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionManager.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
index 667ba76b21d374a336c1c153bf7643d16851b523..5d434f51b445801788934dffc71d1324862c0620 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSessionWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitSessionWidget.h b/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
index 8781bb039f41f60f23b6c807fd7f64df08e3fa34..a156f048e540e56b9fcfd08d1a3ccaa1ff43d215 100644
--- a/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSessionWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitWorker.cpp b/GUI/coregui/Views/FitWidgets/FitWorker.cpp
index 1097ab0ce759d9a34d74d44b52ee7c620622a474..f711ff879364d6042bb93616662fd4a2078fcfb1 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorker.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitWorker.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitWorker.h b/GUI/coregui/Views/FitWidgets/FitWorker.h
index 5a0c3e67367ab42f5c175d3d85092cec6109f9b5..29dcfc08536dac3e1dd78192b57865153b649c6a 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorker.h
+++ b/GUI/coregui/Views/FitWidgets/FitWorker.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp
index 4eff026dd710bad27b0706f84ec27cac14c3722d..69921b5122371763ef738f0312255108fc0f5090 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
index 34c3be0f57345fec397a3837a8e090b50c011879..b5bcc9ab9031b57e2fe09905d4b3dcb06a69ef76 100644
--- a/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
+++ b/GUI/coregui/Views/FitWidgets/FitWorkerLauncher.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
index ef5341891936b80ecaf620025643ec291b0841e7..ad78d03e54205d3c4d57483f2b9b7168b0f0abc1 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -79,7 +77,7 @@ void GUIFitObserver::update(FitSuite *subject)
 
         m_simData.reset(subject->getSimulationOutputData()->clone());
         emit plotsUpdate();
-    }    
+    }
 
     if (subject->isLastIteration())
         emit logInfoUpdate(reportToString(subject));
diff --git a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
index 6d65fea40646c30902e739308f5d19e4cd9bcbb0..b59ba672b9912c23149917c0932f83091d915e7f 100644
--- a/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
+++ b/GUI/coregui/Views/FitWidgets/GUIFitObserver.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
index 1e1c8c43a13c05d50ac9aff1191c4ae384d5fe47..bc7d95e76292342bb241c3c5ac96e704668afdcb 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/HistogramPlot.h b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
index c7f8335a079580b143932cf6f15fc732d326424c..aec6300967fb4a6c27adbf75530f9ecfe8fd3c9b 100644
--- a/GUI/coregui/Views/FitWidgets/HistogramPlot.h
+++ b/GUI/coregui/Views/FitWidgets/HistogramPlot.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
index e188ea373e6f3ca09b4fa881c143c2887ca41f39..b0ca947b61280cb143016f6e93931061364a0b0b 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
index 5dd61e9e228fde8b6d73dbe369882b1ace90ac59..8e67e2e660daa69a6df1477cce61e9b2f0a89820 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
index 7fd87e56eebb0c6c2f8522ee440215791d617ed3..0d0940a519a2e5559cb81008d3d7e81ee51356a3 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
index 28beef7d42bd3ffc83f1f0a99a3e49273aea75a5..93cacd5912db3d9d62fcbf692a0178e3851c1941 100644
--- a/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
+++ b/GUI/coregui/Views/FitWidgets/RunFitControlWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
index 0706151b7f94ff839be3044edec4265a0c5d1dc5..52dd44ea5f1e5dd4337d860d9100b6890355666a 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
index 3ee18ecdf472eae32ab97f0d5fe9907708cfe040..c849bce481e4b7adb0849fad55a331586141e907 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/FitWidgets/plot_constants.h b/GUI/coregui/Views/FitWidgets/plot_constants.h
index afe4673576901e6386a842b73205cbc980d1b221..cb665414f83e5305b604ecce0d50b9c5bc3a4f93 100644
--- a/GUI/coregui/Views/FitWidgets/plot_constants.h
+++ b/GUI/coregui/Views/FitWidgets/plot_constants.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataView.cpp b/GUI/coregui/Views/ImportDataView.cpp
index c16a7dc1cb2a8372275eb07394295e67a9401ba4..f1d5a929cf6dac64ed64c917686a2ceaf540f22d 100644
--- a/GUI/coregui/Views/ImportDataView.cpp
+++ b/GUI/coregui/Views/ImportDataView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataView.h b/GUI/coregui/Views/ImportDataView.h
index c61314f4173e6329993b467fbbcf586c796f3329..2de56bdabb2e62c0ee52478e158550a277b925da 100644
--- a/GUI/coregui/Views/ImportDataView.h
+++ b/GUI/coregui/Views/ImportDataView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
index dbec18fa297ee19044edab66266ee70c54fcfbe0..e6189f58b1bf46bb9d4c0a6780f0b5240fb31b1f 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
index 57e51c9b1a27301b2eef2da70a29747129b8619c..3bb6eff7061cf290d36173d800932dbba6cc7fac 100644
--- a/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
+++ b/GUI/coregui/Views/ImportDataWidgets/ImportDataAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
index 20e6f93ba4f0fbe445121bb02471c404fa0c7177..a2584e1158273867a2e1f0a2ab0426a1d43ce568 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
index ce8ac4db0b7602db89b05e22f26b7c638d0588ab..221b5e775e736db4c9a5e1f4549bca8595cef486 100644
--- a/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
+++ b/GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
index 974228cbf692552167928d037d852f0027827041..b569cdeee67448a7b3be595d27bb8d3b876867f1 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
index 5a97d1de1f30afdb25ae7b1e92c0597422a288b3..2c17eb24a167b72967d8a5dd27f88357de140919 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataMaskWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
index d3a267f2b354587ca6d0958ea239d50b9a1f0004..832dfada7619885e23d0f11aa5c84352a3d81470 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
index 327cef8088cd5f6e3d7e828696a591a6ff56436c..fa278cc8d23caed27bec8036df20f21666c00e35 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPresenter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index 9ca03ed5f1f35283a989bd6526d1c24557c49c5b..1ffb866ff21ab7940adc8aee19122d9d2a8337bc 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
index 5e74af0df4a556667c0009f7c165faeac00adedb..837359c5bc4f6ca53b63a9f7a5d2a93ac2a50c75 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
index 22c9e47f0d43de8f7b4351f328ac448ec9af628f..1d8fdd8cdf3d8d4785dfd37355e784143cadc871 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
index e3ebe78a8a16930a05d9204a64b8b1e9a321df99..1dc3e6b6f02179ebb5547576b4fa4b8013b8e7ce 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.cpp
index adb2fe8c08c315ca9bf1f2ce18e9428bd7c4aaba..463eb54a86e5b149974c58d18fff9fb7dde04dc9 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
index dac4f7a0dff8e62b52601a2ed193ba87bf8ef4ca..3222844a5e174096e926a1dfa371baf33f56bf22 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index a8f84dd10cb7975b979dc079840def4ada5c1627..8497771182dfae2f10462678d4e670afa713bf78 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
index 7b491dc8bbeda823f2b968b34971edb0d2d05e0d..72d17051be5973e25434e1b08a278feb6cff7f76 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataSelectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp
index ea4ea6a720560ee32ad05bd888a65c02f44b5542..2661c7224213c61bde4771203b1b8c7f2305eaab 100644
--- a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
index f2fac0ae250f9072cf92e6873eb9cef3024d47ed..e9fdf5a0293444daddf68b0119d71f65e5ecf4a1 100644
--- a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp
index 68bc1e03703807e13d896354af0d7ed0f7465e3d..55b3277552df75e73c3bc6029f0e1d3d2f660621 100644
--- a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
index e403dcac7bd95b049f025f82efca0f37df9d7367..590096830f29685111a6e15ec50ca99f5dfbb203 100644
--- a/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
+++ b/GUI/coregui/Views/InfoWidgets/DetailedMessageBox.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
index 4d3af5f873e39084750f625b3646304620f3b989..0f8ae509e1e9c95008bd662b5831c88feb929df6 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
index 6534d8e9261b9b8f6b9e014334f348c512eb6bca..70eb96f3234fc51e86eab04e644221d1755517d2 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionDialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
index 1341b73c151dc9b32f62b9408e10e4e8387a2728..4f8a09d37855025e69d7a87b0dd8921ce3ce527f 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
index a66d79c320a27948979682a19cf6320acbc08ce0..44f415f4cc72ed4bcdc1155103e760fc78a7ede7 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
index 512d4a311aa75dac709d0a97adda63c5c7b96a8e..f81aea0dcbc3f194dd59fed017c50f3c67fc1b48 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
index c49ff33cac571c22c3212f2d9bfa85dde16451fe..e807df2ef10c2f2dbeb6b687d87495ac15ad80e5 100644
--- a/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/DistributionWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
index 745a327aec681554a8db209b5e2bc42beac4b5ac..5aafc0b9656276eba683ef507c486eeeb9ee18bc 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
index 867799090b46d54887782587415e87d0ea06c04c..02c99f43e7d9a395ef974615e39179118ef52d0a 100644
--- a/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
+++ b/GUI/coregui/Views/InfoWidgets/GroupInfoBox.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
index cf0cc6e1ca9c6e1936c3a89a78a37a140c840771..3854c3f2b5ca595f4e621a503d579a94933b45e0 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
index 96eca7aaa4edbf21e558596c550af74d87bcd953..5cd3ecbf656d0e75d4b53f9a2b2a91e1c282f63b 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
index f818bd1facd671222320f1aefce148d2599829fa..28a7b745cb935d9b09ed3a0fdce5fef6f5687845 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/InfoWidget.h b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
index 0350b99af9c3ea475318f999243d1febd81830c8..62f246ce53139f6c96cbecbb450d10eaaef6b661 100644
--- a/GUI/coregui/Views/InfoWidgets/InfoWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/InfoWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
index faff9859f1676d62f6a689df524a911affa4935d..e2c3d8d935e23625fc43b96a743b28811d9a543e 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
index 1aff76c39998f91d1fdf4ae40bbac2a99b54e448..925c5b1ee4f67e82e8639c542c7fd9d3f17fbdfb 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
index 4e85057cb6f9e79662b8b06b3b35ae13aaed1a27..6a073260c8ab2ad4f4b933e2dfc9ee8f28d994a5 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
index 01c50a0d1c17b15690c091f57e3365732ecadc8a..e3c889fe45e01e9526c6133c99e271cc7fef1544 100644
--- a/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/OverlayLabelWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
index 77c4993bc0feda6da44d0f57a2425d6bef9ceda4..df977ee4089640bb0422a79d6cecbe64b342d66b 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
index feaab53d256953f28747b98abb5ac569b3d421bd..5fb412505c233309533c4264efad8b1830d7fb95 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
index a70a3b289246507e827f3cc395cadea6f11f8ee9..acd7c3f06274f51652ec85514dc4ebb3f574f132 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
index 01d53b17e00467f30b3b13052c050836c5771462..4be3c82b4822b724e7b864413dcda7a9cf9541cf 100644
--- a/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/PySampleWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
index ba7ec46ae7032b30ba538ce6ec0dc24053d03f3d..6d6ca239af9a3aadd9e24bf241446c2b09565874 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
index 24a708a384dae741fdfd42fd3f1caba546353225..4a6cc3754d6ecf627a6be373e1558cb871d03543 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.cpp b/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
index 1749d9f60da85ed951b91ce01ef4ede304cc2ccf..20b7cbfb12761f124f6afd9b365bdade7073221d 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
+++ b/GUI/coregui/Views/InfoWidgets/WarningSign.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSign.h b/GUI/coregui/Views/InfoWidgets/WarningSign.h
index 593950dbbbd3a1e99b9eaf6aef3f6781ae69c34d..ec9cf88f31fb645e90cabf96a9bf8c66f64da16a 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSign.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSign.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
index 71bdc447de4eed572d3ac3f9304d401f0ec68bba..8ee07733a5c08a12d410be5dadd74b140d8d6cff 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
index cb745c2baff81f1684c962e6ea7d571baeab9fcb..40868eaa9825a130687fd866cd02caeb2ccf8711 100644
--- a/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
+++ b/GUI/coregui/Views/InfoWidgets/WarningSignWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentView.cpp b/GUI/coregui/Views/InstrumentView.cpp
index 6f8cd328e7d9028df16b14d80687fa4ac1c69398..213d251fc7e60905318f45b76a8957eacd324546 100644
--- a/GUI/coregui/Views/InstrumentView.cpp
+++ b/GUI/coregui/Views/InstrumentView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentView.h b/GUI/coregui/Views/InstrumentView.h
index c2dc5b0e125dd5d8d3325f059521f9f615cfb5e9..4d35b4ca9318b8dac54e33cde93e7f4f90a554e2 100644
--- a/GUI/coregui/Views/InstrumentView.h
+++ b/GUI/coregui/Views/InstrumentView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
index fd77dcc414f007a6a61888cb048b82edd758e6aa..0f12ba4ad9fd4e572830fac2fe241a8b3e78ec3c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
index c55d983cbf66218f9b636f55acd2aadd030ec7c2..6dda9e94685f1135fa8ac772344174fc8fe0d060 100644
--- a/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/BeamEditorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
index a4d8085a8793dbacdac5c2c11ebfd715003af44c..876c8d457fcd63694fd1cc74b2416c5bd9205812 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
index 79079483d29754dfbb8be6f754761caf2046e08f..d55df44b17936995b362eaa71b15c551fe3c34e0 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorEditorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
index af452387620c796810a8301c05b33b83ac028dd9..ca45e711544efbb38461fb2a06fe2d072da8b604 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
index 5773a547abca772e6f0070cb239defa87151c568..d35ec2d01947ea1f170a1711ea95ed2c29b790c9 100644
--- a/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
+++ b/GUI/coregui/Views/InstrumentWidgets/DetectorMaskDelegate.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
index ae35efbb919004a5a57c40b829c9ccf115c7f430..ad243fedd57322e377d765cefcc611b6bfa16bb6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
index 87462801b6bca0019001b93be267c6f05e974c14..5109d51884b72a7a8da751fe1eeac635f8a63fed 100644
--- a/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
+++ b/GUI/coregui/Views/InstrumentWidgets/ExtendedDetectorDialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
index c1cd823c2738bbbe5437e4d5a248a4755385c6ed..7a902f3e6c5cadcae366323da3c0c80fd40260a6 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
index cf4f035c06a537a6053d003c1a7c9d1541de0aad..affcb283d59d627cc7b15d6776110b483b12736e 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentComponentsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
index 7a48e21ff8b6d173207410cb77848323408bac9c..b50ffedfd00654cb898713eab23a2f4148464e1d 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
index 078ee2143998adf19ca20927bf8836abd36dd0da..21cb35f38706fbf26e2636825fd6374886418139 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentEditorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
index 8975c5ce85bd84139777f4c340fa0720e98624a1..301dc4ea7f617e55fc30c8713dfc46e0928f7f8c 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
index 39fa55170d02a58ec328f7bd85afbdee76116698..a9086e4b28cdb41a6d7cd0a1c14c63428dd021f5 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentSelectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp
index 36ba8796acbc8f6af74c34c66a5dfec13b39a1ad..400872780976caee678a45eab0bc6025b8d8c329 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
index 2f4f304f80c159f85ea51c135a6c51b3b213eb86..41f8d8ba4c3c9f8f7d54972060350f4cd9fecb35 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
index 9fd66887f3f4f8f0dfe903ce2825ea3533e9c522..7c8980e0a174763a023d2f3ff3749fe0faf5d7f9 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
index 1e48b3d090d432c06000c29e04efe0ca92efc45e..5c263d24feec14bc0b8bf58b5c100dbcffda43d0 100644
--- a/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
+++ b/GUI/coregui/Views/InstrumentWidgets/InstrumentViewToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
index d44569b0160f1b1e4a5576fdc21a422c09aacb7d..9d8ea34bf1dc01debeb4f4e22c8e742412f405be 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
index a1aa1b9ffa71759f9db3b61afe6a6c7d940572cb..ccddb27c80a7665d9941b1064ab42d38d5a1e6f8 100644
--- a/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
index 7f6b6d4ba205dc9bc1ef252cbd3bbddadbeba54e..aedd24ff8a7703b27b371c58c1cdc1d2260b2e26 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
index 1fbfebb26d8c464d03ec17e70c4d5771cc68f942..a702e0ed620e38ad22eaff3d860a7c07db10634b 100644
--- a/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
+++ b/GUI/coregui/Views/InstrumentWidgets/SphericalDetectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
index 46a04d91c7b8c8925fc96d8dac0cf01a3b91033d..5e3ac52aaef85f8d1ddb2de2fb17b13850306330 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
index dbd9089b260185b4604fefb17f1d0509e97a4665..c598515c2537f656a8789c93edc30f71ac6dc58f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMap.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
index 2d7f82f6e8036bd3f61f9c505a33bb3eb5de1112..b26e012033a56c16a34756838b1287198bef0204 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapBin.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index cb78aa5dde27cfe444239ca1ffc205e416828651..5b9a1501cdc383d15685f18b31a96303ecb2d6fa 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
index 437bea5f2a5970b9c67acc584fe8c77f76861bd5..f62926e53b16516252be38d424e6a48821b8193e 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
index c11b8ccba9cfcae92b7d2d6e6bcfe102bde4eda1..b3d6d93a68f531d0b2d3261929d4368d5e55abcb 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
index c9c82b6a17ef4e80f96afe6ca578f2c4eefe4233..3e9e92d3d2265bbba7fc05f8f53ddb981e7d6b4a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvasEvent.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
index 537d3410c24b5e49e20375c5c1c5e205bc5bdedc..8a5e9e2ed872c9ed151722f80e1b30b327883780 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
index e4b77ad14e125f61200b8672b23cc468619dce30..dc114085a3cc0481cb32f05b34736f75384f2596 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapEvent.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
index 03fd83802ee7f40dfbc2d21ef0c20f9144edd8d1..a97369a4c665d3e54ea95a90c6bf1cfee4ad8db2 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
index b0907b1ea2745a2f251395b7298453bc2bbbeea9..f43d4548e89103e436633184f336025a7042d108 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapLabel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
index b1496ed369a616ccf52452de0806e8d4295c6fa1..fce959f7f4e3d9b8a58777ad2d1090e50a73ebcb 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
index cce6926da5fdb6a7a15d839965dfa2079a9e6efa..26c7870eae47179c35fa11ab0f24a525352b7d82 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index 4696eafecda78f8f5705e80632f4ee9e7e816e9b..1761037098f2e2c6c2c6d6bf5d32a0ee78bd1ce6 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
index 6dfab59c78f447501ca1b540cb8d4315043bf9ce..de0c1cdb12a8b4ed0591a6fb198bf296074920e1 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataCanvas.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
index 1561fa6efc531b53fbd14abc4de7bd2098ef45a2..33e9c169442ef5c54d47d00be7b4320f3ec99031 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
index da30cb3255d35cae6432ca5c28542ba11f5c8424..01eb82b17e8a9dfa79e0c1c9111856b21a7f3fec 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
index b180fabc83e04c7890ae63abddb74fda32aadacc..41d501a04ede1547412464b9dde81d32a641ff5a 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
index d00c39d4fc92a60095c5a214881258196cfade29..33c5849a0fc356084c0fc83446a072ae05ccc673 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
index 2971fdba56bdf14d4b8c8d53ded9b52b616c52c6..55629ccf9733dd917708fbe19cad28b8d6307404 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
index 0a8dfa674db860b47fa91cfe402774fec5f507ef..38f31caaacba2932bb1c4f1a118c203d43496ad4 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
index c0f59b0406988d92f7d18f9141661761b2c3cff3..affe81ed4ac1b2e618e534bae3af290e004b0631 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
index fe777ff4577ead98e21ebe0922c81b0f035b13e6..9f5aa601ac4d4c9ae713274c97aa3bb270bc0a07 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ProjectionsPlot.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp
index 3cbf5382d20478f4bc4a0ddcfccd8d502777def1..50ac83c78e4a674dd98c1590e26cfc614c55e663 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
index 6dc5c8983c2b89f874aa956728b5854e996d2549..5d41aeedc7c43262cb6f6074ef907e3460da5e45 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/PropertyRepeater.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index 4b52ffacc1c55c7681e7731a0fd213774e000c16..5a2b0734f9e825f15e60cb9ff68c15e400d8482f 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
index 5e07979c0ba070d792be97860670590babf34789..eb09ead99710df4ead533484604d0cf118d075ab 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
index b5f850d813801d811f34238b58ff23ac260c300a..c6de74557ec08c7b2a6a79024c0c04510d4092c9 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
index 7ed4d6e2aa5c5d7941dea80e8ee308dc5d25f44e..be03ef14dfc34904de917363b7508c169ab2f448 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobView.cpp b/GUI/coregui/Views/JobView.cpp
index 27dfb2e01258aaa8002e7f765161361f15696962..af6c3f2f3ca2c161f1bfce812a3eb44f84b1c173 100644
--- a/GUI/coregui/Views/JobView.cpp
+++ b/GUI/coregui/Views/JobView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobView.h b/GUI/coregui/Views/JobView.h
index 32d16ebce0ba890ffa4b6377cfef4fb63e8e4831..5822ea005469c203a0300023b3fc4b5c732f6325 100644
--- a/GUI/coregui/Views/JobView.h
+++ b/GUI/coregui/Views/JobView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
index 76247c60b28e5f5b50c5e724718c9c794b1a37ce..30f5d63f68962ea6d61d72a619947a142585fed9 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -29,7 +27,7 @@ JobActivityStatusBar::JobActivityStatusBar(MainWindow *mainWindow)
     , m_dockMenuButton(0)
     , m_mainWindow(mainWindow)
 {
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);    
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     QHBoxLayout *layout = new QHBoxLayout;
     layout->setSpacing(0);
diff --git a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
index ccae23877756770be6fd40bf0a2df60898a17382..8f0e60a1390ef5a03f25cb350f08d52355b3720c 100644
--- a/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobActivityStatusBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -41,7 +39,7 @@ signals:
 public slots:
     void onActivityChanged(int activity);
 
-private:    
+private:
     void initAppearance();
 
     QToolButton *m_toggleJobListButton;
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
index 7ae5eba516857bad6b1622d7f2b1f1480fd84e5a..37e9bba70cd45a78b74a9a419ac603eccde2190d 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
index 5db4390fa84d185cf1ed46a0f7765e51fadb3c73..1d12711969514038940c41d3ab9350c49ba728b3 100644
--- a/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/JobListViewDelegate.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
index 1693adb32eccc770fd87e5cace1c9cf31be7b2b7..30c30d0b23a8a95ec27ae40aef5a3733eaec3fff 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobListWidget.h b/GUI/coregui/Views/JobWidgets/JobListWidget.h
index ea7fa7a40138e58dc826ba67111293ad7a9c5142..951693be5cc141294044034dd0517f27dcea58b3 100644
--- a/GUI/coregui/Views/JobWidgets/JobListWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobListWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
index f9db9a4a57f2c90695fc8dc86da3a376fff0e028..29d951cba4f0ae79003b9d90a80d292faf51970c 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
index d7aabec37ffc8aea0504696715a333bee0049f55..b53303ddb4ae90efeb3cc851e0d36dda82f3fecc 100644
--- a/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
+++ b/GUI/coregui/Views/JobWidgets/JobMessagePanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
index 295ee692324060bc6981d94ea591d5c9d80bb60e..063275eb4035a091a270752937ca7a79737f8c68 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
index 72687f6c574b8187af76b347cf3fdbb6aff7b523..4f30780754fb93069326494921367648ab805e95 100644
--- a/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobOutputDataWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
index 1e667bc604022bf7766c001d96a1fd8fa5ed0f1d..1c2cc96291c4cd924aa084f9d55eb37bb8dab766 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
index 561327d7b864be7c3bf7cede8e24e769cb005167..4ff43e784893c8ca5457b6f58946ad82997ab330 100644
--- a/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
+++ b/GUI/coregui/Views/JobWidgets/JobProgressAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
index 93aff01fbc1e8356a2149d8dee7653b6b533dae9..23de02be27268fc58cac28e708ff6d750aba486b 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
index e83c36e52bad581774a22351fe71e3c70a181759..6e2bc04477d9dd587f313ac8dd5f933739dd4be5 100644
--- a/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobPropertiesWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
index e661929cb2c17307c3a526ed1362f2010d9e428d..d0c83b226c94c05397a1135468d68e3f9ea752ff 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
index 90b153f183ad7c0aea12e9a176459771be14a60a..bbc08f65a31d7ba87595a82942fbd40298736da8 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
index db7c66027835322188d11a43620e7811c2bae71b..325d9785fb5b24c14e5c4d7fa23eedaaeed1270d 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
index 3c1f05720f02a326a72b47bdaa9b76372ba59e1c..b0744d60b034c25285d6bde6c2b82c4fa75fbf58 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
index 76d6ebc55e31b9811d7bdfe7891a7a7f593be173..ddff3db8ae1def7644d8e8c13ce5e23464008c9d 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
index 7867238c205835a19945417ec6188a5289d9ac88..43fd1dac4604bd8ba076ed22f96abaefba9ec357 100644
--- a/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
+++ b/GUI/coregui/Views/JobWidgets/JobResultsPresenter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
index b76c498bffb89cd8d344f4f51d39ac40c6bc4492..e7c3ab1c02b9e53a63364b9a50d64dce874647d2 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
index 5166d0d5c0b025068c961da57f4a801ad8bb87e2..f2421206c9d49bb0613160ebc136f168780c2b07 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp
index 82e71ddfa72af9ae2ad26e32d7acee813304a5f1..9a4f5906f5c81f9142b1e4edd880f4db472180be 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
index e6b097f7f490c7cc5dfaab2a0702ddc99e4885a2..7d16d9264e6b23cabb54789a7c6ddb31662cfc1d 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
index e10d706c2c555ed9dd5ddb438ca7d8f9601c4c4d..e665b1bb41ab2a94c56f6ae149b74e2325b19389 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
index 32ffb3cf875ff1dfbc0373a9d1bde7a3a50746a5..e269f449802db5cb7305962a4f06b81a0a19ae0b 100644
--- a/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
+++ b/GUI/coregui/Views/JobWidgets/JobSelectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
index 7836d7d8c0840f0ce5d6360dc00b56257a01c887..8524d6e90d6eaef11dc8a3d0959c9bbfc07c9da8 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobViewActivities.h b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
index 985f98f00bb07bd2e9af59dab3e68dfe73baa1ad..057e2891f05ff3a10614d7bf08b074555dbc69a1 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewActivities.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewActivities.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
index 3ce34e3b6889db4354977316c37628860898fc46..fd11010402cdfb5bc7329e7d3c442d1ee9529171 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobViewDocks.h b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
index 072d325c50237b89dbd27fab616a4889a342d39e..6cd395e01f6fe903652d7715d5eb78abd8b8afcf 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewDocks.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewDocks.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/JobViewFlags.h b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
index 467d682d4bcfdd1ed49879aea1203344885e21aa..4b0bf5880f0fb425fb2b98518b71a18c0b327165 100644
--- a/GUI/coregui/Views/JobWidgets/JobViewFlags.h
+++ b/GUI/coregui/Views/JobWidgets/JobViewFlags.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
index 9e0b4ab195f6d8deb13c1da256bfdecf199bda2d..044046c1c6bc1565ecf2aa3c06700dd83cc9c84b 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
index aa497d1ad5415d95adaceeb922e47503e5ad5cb4..9458d75d6a96abbf338224bdfba69acc6b32e2dc 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningDelegate.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 6eab1a3cfd2476a30e8a8470012dac91d3ae2e34..ac77ad93819e8fdc5b14c228f99ca91ea282028d 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
index 206bf79c00c9acc6cdea4773d13e6b90d4cbeaad..d9349aaea5c2170356930daf38a9ccb47b5e7f8f 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
index 0f1cb55da8afa9d743952a2004fb39d802c50e0e..93dbbc7b95fdaab0bb28a159c1299a179f21cf1e 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
index 519e9ee147eac7e73779738b1a99e6d09c855a21..a96b4da73f585b0d0472453bb15c90994ea5d0d4 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
index b23f960eae20efab7c0658ecf2009dd2af90720a..8af05687b203d32b477c4cfed2e50a677effd8a2 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
index e7fbb4bc280814e39a20b6ac1d27c95db1796e50..501806e42b2940172734f220aaa3897a0546bf1b 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
index 43236ebd3bd1338c93826932e6faf7979dfb5cf2..6f074c9a0adef5dfc171effd27bd65841f546018 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -156,7 +154,7 @@ void ProjectionsEditorCanvas::setConnected(bool isConnected)
         connect(m_colorMap->colorMapEvent(), SIGNAL(leavingColorMap()),
                 this, SLOT(onLeavingColorMap()), Qt::UniqueConnection);
         connect(m_colorMap->colorMapEvent(), SIGNAL(positionChanged(double, double)),
-                this, SLOT(onPositionChanged(double, double)), Qt::UniqueConnection);        
+                this, SLOT(onPositionChanged(double, double)), Qt::UniqueConnection);
         connect(m_colorMap, SIGNAL(marginsChanged(double,double)),
                 this, SIGNAL(marginsChanged(double,double)), Qt::UniqueConnection);
     }
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
index 6603a1a03454bbbb5a17018ea7c50a62f02a6c64..54b18cd508a55d479a4b16863d93f1d20e4a0a56 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsEditorCanvas.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -72,7 +70,7 @@ private:
     MaskGraphicsScene* m_scene;
     MaskGraphicsView* m_view;
     ColorMap* m_colorMap;
-    ColorMapLabel* m_statusLabel;    
+    ColorMapLabel* m_statusLabel;
 
     SessionItem* m_liveProjection; //!< temporary projection item matching mouse move
     SessionModel* m_model;
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp
index 14c1970963693758466b9574268043ad7139595d..d1a44a1c0ea2e5e1247cfa8e3217bd6db51c6ce8 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
index e14d7e01f6bf19043e26a4fb99e990ddd617bae6..10c3c71a78e0d3dead215be3c9a5a5f4d291206a 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsPropertyPanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
index 187afc99e2ee0a05b1d283a0d909832e00b17384..2e41a4980062d2b1afe531447d96b0aa9c711926 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
index 1a68482297dc4e65429874c5f1a466c0a400b26c..8fbbee7a860251df6fe9330e4414013e79dd36e5 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
index 0e51c989275feb9c1aacbab98b3b95aa156969dd..d4b6cc2fa1748cece31d5f807a62b387aba2939d 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
index e92175df5533249878925ab5686cd037c447fd1c..dfbe4927671623ad91c5bc2d840b9f84f99eaae5 100644
--- a/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/ProjectionsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
index 501af14f1ef4d0ed8f5b25d9086f8f5d14e4566f..73638ca828bb5d873eaf4d03633e52c5a202d670 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
index 85ed65db50eef1523bddbc88f3cc880887b3900e..a598126f4387a8ab09a32d0036dea9a696b4e010 100644
--- a/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
+++ b/GUI/coregui/Views/JobWidgets/SliderSettingsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
index a9b17dfb273ca2cddbba3467792e8ca7d96c2342..ed09385c89f96258721e2595a12d3b5e20381320 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
index 162385c100cd626a6c441beb348990b01b9a1280..7e97b1f064950caee1535cf48a8b5e5a8948bfe8 100644
--- a/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ColorMapSceneAdaptor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
index 5c89c131a8eb9b3c489a5647102bafa9c60f356f..164b69d8181a99804b9aa4e8f85560a23d4aae8f 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/EllipseView.h b/GUI/coregui/Views/MaskWidgets/EllipseView.h
index 09872e6784e9f25286835719118efe647de09d79..58d4f0c8c15d45b2ecb746dd31af2393b337225a 100644
--- a/GUI/coregui/Views/MaskWidgets/EllipseView.h
+++ b/GUI/coregui/Views/MaskWidgets/EllipseView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
index 82d18a9f46de51046d2c683f5782edb4710f24c0..6c91ddb914f02cee2e837261485c96aff9eb627d 100644
--- a/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
+++ b/GUI/coregui/Views/MaskWidgets/ISceneAdaptor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
index c53a811996517ab7a1d231d01bcac6d5926d802c..4ff66424ae05ea32a198f0db4d87fd7db60b21e0 100644
--- a/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IShape2DView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/IShape2DView.h b/GUI/coregui/Views/MaskWidgets/IShape2DView.h
index 6d0f880098103822fccd91f455d32016e762cc04..474be4ca45439375a243ff035d5f7fc8c9b67433 100644
--- a/GUI/coregui/Views/MaskWidgets/IShape2DView.h
+++ b/GUI/coregui/Views/MaskWidgets/IShape2DView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
index 6736a3d0c9622b11860b349e394d7be657f14234..f40c6b49aba821eeafb24f05e9ea3dadabbe5cb0 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
index 018223718cbd9210f726a9eabfcdc8917ea6d1e1..b3e9ed01714442230ceb08c3530b699f7065ef2b 100644
--- a/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
+++ b/GUI/coregui/Views/MaskWidgets/IntensityDataView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.cpp b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
index c44ac35868252673990f4d7771d584402175c1b8..6be66490b917f5ee6e49421a22e6aa4e92151a43 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.cpp
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/LineViews.h b/GUI/coregui/Views/MaskWidgets/LineViews.h
index 880d958b7b9bd1b029c5f9585e104a5875f8255c..e8265ca233a7e2a604189d24e49301bf2b111eec 100644
--- a/GUI/coregui/Views/MaskWidgets/LineViews.h
+++ b/GUI/coregui/Views/MaskWidgets/LineViews.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
index 4406fb129deeca8f38f92ee27715136be69463c1..41bbe147d6070fd479f77b23b502d4e3c8d74c2e 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskAllView.h b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
index faffce4e33e6aff48bf39a1d7ce33db7f04c7c03..6a3379a2bd2f057b0b9f6e5abdd22286d5a12a02 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskAllView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskAllView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
index cf173d93f40ab67e3d9abd68e933b058a95efeba..c335f17556139063f3d818e8179ceead880cffa3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
index f9d22669a7011f626ea7af74a752987ce18675e2..6001dd83095dfbb58a08703a3ae0beeeba27c115 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskContainerView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index 3810c0c83298c182b987b211472c42f50cf2dc17..26ef132fd5398d9215b0ae2d97f11e56dade4b79 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
index 82d38026a35a13dd69332f81f7de4a4835506175..1ebf9ffa49d69b8b8c63c021d6b95b7327f4b1b4 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
index a8d965283458f47ccdf4244574bd6cf29e0c8573..9024886cc4d39dea65779a7cc4d66b92d0705f7d 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditor.h b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
index 23659b28d932ac19c1bd7e01a035f290145d41c1..ca9272a020143aa672dbd1701f9b13cede3098c0 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditor.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
index cd1d7e746be4ddea61f13901a3d4ddd448306c5d..8c8d1964fed74d557a6fcc7adb5f7c3e4cbd9df5 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
index 5962b0bedecd9068b70c3e16f0488913bb4572a9..2bf4fb4433134cdab2dbdffcbc46ea9e75991b3a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
index 45afc0005a150205bc431b348d64cf589947ea21..58449ba4ad901e08f502db3a91366fd48656633b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
index d9e1acb8cd167497db53d54b28b8abf7a3e01954..435281868d3dd9a5bf0e255ce6cd75f8778c9804 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorCanvas.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
index 9b7fa7833d1fb86a7ed641f66f4cf281b6dd4abd..d7d88c123c46c8f07687a165b6cf30567c95bb0a 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorFlags.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
index 7f2e6431455da4d7b99caa04f693186cc4b363f9..e4a06770aa48dbfff7525bda91c3cb80d435f604 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
index fb8694f35d8cc5996885260d19df4b8c324dd58c..59d89e67d6c54b455c5a796855d0a7c83d22e189 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorHelper.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
index 5b6803fa910d9c115bb59742e35a296f12f21179..6fd5cdbefdba7456135a14bb2448a3aaf0f7c07b 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
index 7553955b786b042d058618e20ee431e277a979ed..db1ccdbfc4c414b52a4d23f27d61075d6d765ad0 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorPropertyPanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
index 06282772c2820724fd56a9b6e30866cd203ee8f2..3f3cd3c603caccc8750df61eb46989a42a8f8442 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
index ff2d69377d9fd192c6f5e3a291cf2d2fc23c8052..7e4b08b5b442d1adeb60cbc7b974001abde7cfd1 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskEditorToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
index ba6e511e5c61feeccc5c045373b94a6ef0fe1b0d..d5403d2092182edabd3c16b617a6ff600b4c23f3 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
index e30bac1fd3d7ba517fbdd63303b45639d27adeed..0269f0162c7a041479dabf322b4cae80edee9b6c 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsProxy.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
index 7d737d2c762a78561fa2170910674bffbd8bb66d..8fb6b0f35df657b6743ae95ffaf98eec151e1644 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
index 365c4653fec5e3e6ddc2cc0f496f152bd0626ce0..705f0bee5616ee66287127d0e8847819fe38e037 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsScene.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -87,7 +85,7 @@ private:
     void deleteViews(const QModelIndex & itemIndex);
     void removeItemViewFromScene(SessionItem *item);
 
-    bool isValidMouseClick(QGraphicsSceneMouseEvent *event);    
+    bool isValidMouseClick(QGraphicsSceneMouseEvent *event);
     bool isValidForRectangleShapeDrawing(QGraphicsSceneMouseEvent *event);
     bool isValidForPolygonDrawing(QGraphicsSceneMouseEvent *event);
     bool isValidForLineDrawing(QGraphicsSceneMouseEvent *event);
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
index 0a5a532c035633b98d9e11a3a8c50d3329c66e04..0284718fcd2c0cb50184971f895afa225aeafa94 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
index 7985b462e207f01b4eca844e4972329417c61e99..83a1f4e87b23cd6528b0952aee35b5fc902d7380 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskGraphicsView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
index 527f2ca8c5ae42f8e318729e2813e8fb49bceae3..2da680cc6c34b71706d7e2e2523a39d91ccfeed9 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
index aed055fda9e4bf3b4c20dfc070763beca60fd88a..521cfa6fe1aa0ecbfe2eb0901c7b87615693a160 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskResultsPresenter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
index 59a44672fce99fbf6a4890135db15bbe93935dda..e276213880df1e04e6d26a1667e48aae9fa97221 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
index ae383b7a74cf63a84ab5e50223c96a843cc5c3ea..d374ec3a5e3b3ec045492f928b4a45ea0cf931a5 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskUnitsConverter.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
index bd886836f6627299779d909c5cfdaf0cb283d32e..01ace7ece79cb034e773ad4f9e77a5e9db723045 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
index 3b0e3950815cecd9f65aa63566bd042ce42c79d1..6a55db112eb5dddfab922eea03b98e5f186105bd 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
+++ b/GUI/coregui/Views/MaskWidgets/MaskViewFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
index d1208f4b9d1c49e315802115edf8e10bbd554689..296922d5e846b373024a3866802aa0f4068f4a66 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
index 15d0e9caaaa6e53b325ace102cbba08cd46b1709..1d5cb73e994689bd107adc86225a008e16342c3e 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonPointView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
index 2380e7e6948e254f00df0ac5a8e3871e22413ecd..7a19f710c67899899e562d7398f9ea05de383126 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/PolygonView.h b/GUI/coregui/Views/MaskWidgets/PolygonView.h
index 949ed87eec3e89504aedd67bdf313b46b03df998..366dfde526681e46dcb50e2ea855954035dd26e7 100644
--- a/GUI/coregui/Views/MaskWidgets/PolygonView.h
+++ b/GUI/coregui/Views/MaskWidgets/PolygonView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
index aa22f72121da47a03f893307b4a7df6af8263c7e..4056752ab719fb4bea141e043d6263b66adf1021 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
index d30c8decf2b3389cf772f9271da6bbc344f900ab..587fb9059e915a3c7011e10bece5281f25a6d37f 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleBaseView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
index 1d907a795fd52dff7d7185ce28775376fa3c10d1..f0b5cda81de88d6ea3ea0a5a3050718fd27ddcd2 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RectangleView.h b/GUI/coregui/Views/MaskWidgets/RectangleView.h
index dc59902d2bf160a1fca41cce627767b547646b98..f688a2031cdf2a38e40be051d33c4d5c0da70ffb 100644
--- a/GUI/coregui/Views/MaskWidgets/RectangleView.h
+++ b/GUI/coregui/Views/MaskWidgets/RectangleView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp
index 83ecbe30433029345486f4eb0bf9cbb23b0c6f30..0cae94b2dcb28edaa98e688ba833856116dce4ad 100644
--- a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp
+++ b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
index be745804e6435a83556077e88176080219e5229c..5ea9ae807c9112288ab262575baa708283f2dea4 100644
--- a/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
+++ b/GUI/coregui/Views/MaskWidgets/RegionOfInterestView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
index 8dda20be7fa14df5a9e18947e9d3c76e1b4cae42..2b6d141208cd7dadc30b0693e30c3f271b1f2571 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
index 9a7524331f78bfee34e7b6f5ac3133222f4d6b54..afccadd47e34d0fccc8bb8ece5f6d656a630922e 100644
--- a/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
+++ b/GUI/coregui/Views/MaskWidgets/SizeHandleElement.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp b/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
index e7710e0c9835ab3ee75785a7608b140c08b93447..0f59a16c74a2e24f5f83bad4a49669dae70a9c3e 100644
--- a/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
+++ b/GUI/coregui/Views/MaterialEditor/ExternalProperty.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
index bc89186ee603277c86118ddf957a25280e1da8e4..a9b8ebfc73d2a433fe53ec0f99d99aa215cbd57b 100644
--- a/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
+++ b/GUI/coregui/Views/MaterialEditor/ExternalProperty.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
index 699a3143268bc3f5d4718638bc621580bff68546..5b7b9c5727ddc732a312a26d32cd659c9d86ffc1 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
index 4c27b624bd9696d616230e8f2dbb93077b967ff8..072e1225852176a4d0ba1173c7a182b40cc548bd 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
index 9b870a591717b82ae719ae092ce70a551f1cb1af..febb3c37bb57e5db58156d4866474fb752316ddf 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
index 9bf6effc92c5f234f3fac07e4a6303a01289ee90..5f93289a231912c73910eb85e07af360755287b6 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorDialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
index 42fcd4a2bbf207bc9eba5c4d42df4821f8f4049c..325d800e4756d8d779cb2c4599603abfdca96002 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
index 1302e8828197396fd1167c86a6ba4fe822bd1a7c..fb8bbd211015362d932709c29f1d76d43f698070 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialEditorToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 6b4cfa95ed5f43044e38525ee461845c1feb6e9e..3cd27d8e0ab4dc7ffc86a7f4091ccd80f29682f7 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -62,7 +60,7 @@ ExternalProperty MaterialItemUtils::defaultMaterialProperty()
 
 std::unique_ptr<Material>
 MaterialItemUtils::createDomainMaterial(const ExternalProperty &material_property)
-{    
+{
     MaterialItem *materialItem
         = AppSvc::materialModel()->materialFromIdentifier(material_property.identifier());
 
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
index 61147c38fd8ad2dc794299afd86254efb6b05f35..ac948a215a7c0d0bf2bdbf6cc5d4447ebccb5356 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
index 1d9d831cd686f8ad3d8d8f309392761c9254d548..24312bddfe1587cd20a5d24869f6af5202059c38 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
index 38599ee699b66759018b26b0a50714fbe217ea16..fc258c60f09dfc077621e57ee318b46ee656e35f 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
index 4c15fcb35c426d930bbd07ee4b23a95c2ce80556..67aa6af2153be03d4324f71ae51ae1f45c227236 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
@@ -121,7 +119,7 @@ void ComponentFlatView::clearEditor()
 }
 
 void ComponentFlatView::updateItemProperties()
-{    
+{
 
     clearLayout();
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
index a04017420ffa6a97625b8114379181c556ba995e..89c7c05ae117486b16d05f8e7a6cec84de992ef2 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentFlatView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp
index 72de8b828c32cc6dcb7037d43064323f9edde20d..61e2904834668facda801ad9613cb4a3e461cc28 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
index 6d38b11ff1395e98b55de9ed42676d1930847fb8..70f59d11a79704e5bef1806101f42a526b69ef86 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
index 3062654fcd0fc556f0ab0e55646af3014ff15b59..0fe3942195db784df00033477b1ea6f513cfee23 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
index 2cc5769bfcc8fb67f8d567632fa005fd9b634ab6..74b2676ef607a31707ee13778397d770653d9490 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentTreeView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp b/GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp
index e62a584642a296c98611ba19692ad0b3cb32f4e1..b4a348c21e4fdcfdfe8162fa0f41288a55003c8c 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp
+++ b/GUI/coregui/Views/PropertyEditor/ComponentUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentUtils.h b/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
index edda2d2a280370b53bbd2b0ff88beb9ba5501238..5828aedb775a9d9d2d8e3152fb4409a0698a35c8 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentView.h b/GUI/coregui/Views/PropertyEditor/ComponentView.h
index 5820f11bda66b82bb969353932bf1f4945bcb691..50064d0d2e42935403000c5834b9947ba77f6887 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
index 77bb29ee912a9e105fc47842adff0d8231a541c3..e28db4dedc826eb0cd561edab33477ab11333793 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/CustomEditors.h b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
index 5b2ffbef8502928a8f44449e28c5d2154c75314c..38c8c6a3ef6d50cb3d8c4066a70705672ad42200 100644
--- a/GUI/coregui/Views/PropertyEditor/CustomEditors.h
+++ b/GUI/coregui/Views/PropertyEditor/CustomEditors.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
index a9e013717e31dcf3274f3611ebce5d12595f66b7..52e0f243dd5bd2de8245b476cdb6e3a88979be56 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
index f0bdc41721d16b7fbab390d56d3fb4619d03137c..a72adc782c78a2be0012d4d9291a549b8d1d5fcd 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
index 664e548afbb918630be097c195cbe61758180ed0..51e7f8314a66700e88e296648e508f93e717e53d 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
index 7a1542aa04a57497b88013971ac44171bc0071d6..d2b59cb0148fd164cc3787378475e57cbb8ba44f 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
+++ b/GUI/coregui/Views/PropertyEditor/PropertyWidgetItem.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index 3a5f99bce95d25a313a1030e8c3004b4ea2e5cfd..27ef40c5a3dde4a7aef95f6684f63e2c2fc050ac 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.h b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
index 21a620bd78bab442994ccde6bdb2f32e10bf900b..ac9b98c6f9155ef545a4c9412b07900c5910d8e2 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.h
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp
index aa0de1164b19d2b5e1ec79b67de2cc02837f9ba2..8647051130bb426e7b79707a75ea8f4e728d9fea 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
index ad6d099e8b44a7caec69fea2dac0e23d38805af1..0dbd4b8400e5442ac271bfa67ff32d6040f63413 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceActions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
index d111447f9e5f6b3e2455e37c1dc23968146d0ed7..fe195c91d95dc223f14367d985101e1c6be06386 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
index a0e7d578bdb531d9b291f419754e8cbffff480b9..b91dbe7c371ab11b9e800d1756bac28e007ee376 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 8eeb6ece5abff3013b3d1271e579de76983ca497..07530e0cc967d59d39ac9e82ecb069670d4c2ab1 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
index fd5e8f64bde979c529872be8d9d57ae2431396d1..1542a4d9c6b7d4b9df9e52a949af511941ca157f 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp
index b28421df696f9418f526ee676303af743690ef16..ed8c323ef356f05a285f4a406d77e2014d433200 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
index d40a2df8ea62d86bc139c912658585967fb30c94..db45bef7b8ba4c79c96a43b08425f35cffe37a97 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceModel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.cpp
index 630fa1f8dec55b7b46fa80dfa6ca161311ebb8eb..6041a8b3c247060217d991bdcc6ffd0f92a23970 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.h
index 923f8423976a6e0dba553e4e14873038d09c0e3c..a9874d5b5d494ab0bf353eb7f73a03f138e4b809 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpacePanel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
index 0d3cfa5b2da33b340206b305480729e2622e1a4a..1540c594fd25e8442ca4e982397f88a6c7e0303e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
index d15f8adc89a54ce6192e9acebbcf6335e5b5f528..de480a3bb72779076342f5939a6daa83343d31f2 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
index 6c70cae6e5275a9d2332502c648493e0cacab801..60a274c8dd2b5d7b3417d0539bd47fc1ef2026c4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
index cf7693c97bf90f1b9f658b7084e35d3d1be30e16..f059a65ccfd39f9b4f1425327f048f8d28ba2587 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp
index 4f0d9733e81c02c716f66d5b5bcd694f729e86cb..bcc466c46067d1611171dea03676210fa6720142 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
index a5c90305fc53e81fa2ca9d27a1c2692fe2f7a02a..1e5ecf9cf21bed4850cf3310cd53f63b1dcbb0f4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
index 15b6f7cbbf3d60a8a5932a81ae360ddd6d5e6d60..a963ccdb5ba7f923b8f5bc55c490b814eefafc5e 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
index f4d9608b118003d5112efeba0dd8502d883a6846..e84ffb96b19dd9433a33d6c32c0a9ea28557f8d6 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/TransformTo3D.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
index 9c4036966508850f0fcdd6ef9170edcf03d13f97..d3790e4e262f986a3cb84a6f6e31b70a31f40d9d 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ConnectableView.h b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
index 3af8342b03b1049a3d00ce8c6354f8dbf8fe649e..4a9901af2e62340ce44cb9266ad93b9658d098aa 100644
--- a/GUI/coregui/Views/SampleDesigner/ConnectableView.h
+++ b/GUI/coregui/Views/SampleDesigner/ConnectableView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
index 20ebde9c7564fcb532a074f540271b5cff8700ad..a1510aff525c817c8bb1d65fc3a346c8054e6371 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
index a893a2a49a98d0937e59b91269a2e991a00a2a85..0b8b45ce868ff3c120d44fce016f8732b5700675 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerHelper.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
index b108e1cb0cf474344d5dd64a5e3a4898796c73c9..379f3562eb955f34d0c5b472aaf18be1b3948f13 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
index dcfe16c3608e184d96a58c161c1fc1826b342c06..b0754262d0de0066bb2852a7ae94d21156611f77 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerMimeData.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
index 00c1ddafba708cce976e46717fcdd21953d2eff3..40bdb04efbc42925ad9fd1763211448f0f323c72 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerScene.h b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
index b9d31bcda2614947177889f399925ecc90b6821b..dff91bb3576a7bd5f194089ff071a6955373827d 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerScene.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerScene.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
index 00da5b6492772240de463b90509cd78d6b968994..eb61e303dca2edb2731472aa853579eb88120c7d 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/DesignerView.h b/GUI/coregui/Views/SampleDesigner/DesignerView.h
index f90628dcfe8daa4ebb73f2b3f4548f2f9e49929a..e07dc1cf6ca83823f274a0feab76406906750c2e 100644
--- a/GUI/coregui/Views/SampleDesigner/DesignerView.h
+++ b/GUI/coregui/Views/SampleDesigner/DesignerView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
index 24e3907039a2aeaaaadbc1bac062414f5f453a59..69105f1ea66adbcb2364746ffc6d076055265a22 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/coregui/Views/SampleDesigner/ILayerView.h
index 0e549bfc530236cd729668cb7ae2fcd07032c872..ef795312fbcdc6f9ded97e5e9bdc8254258aac9f 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/IView.cpp b/GUI/coregui/Views/SampleDesigner/IView.cpp
index 45a717a4ed1b3ff963157a9d01c1310551762974..03f34bb251760c6d286d02344c9a347f9597aaff 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/IView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/IView.h b/GUI/coregui/Views/SampleDesigner/IView.h
index 259e52f2db6824d337b8180510ff8732be6ff71c..22d20232fe1130acf0d25d2f599e29456cbe161d 100644
--- a/GUI/coregui/Views/SampleDesigner/IView.h
+++ b/GUI/coregui/Views/SampleDesigner/IView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
index 4614f62febb81578484cb809a780e8a2f4624483..c3fbc352f3ac7cf05a6c2fbbb29e6a74777ed864 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
index 703ae278671951f6332721ba1f4906ec25f76b81..d2c5836580571397ef550157ecbf50b5e568fbb5 100644
--- a/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
+++ b/GUI/coregui/Views/SampleDesigner/InterferenceFunctionViews.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
index cca7149b2c0f2c02e1555acdf8ed555c57a43de0..f95d1f3e766c1f22d8f4156ddf4554933f5a3933 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
index 59ff347ae3adaaf95fa93099e345911579f94c8a..9bb163d5ff4162b517ad95f2db72f7a3b18c9b35 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.cpp b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
index ceea644b8f43df52e3a338a4014b8986e95539ec..efa8ad50bc1729dd21fd4e35290b9309b2b37623 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/LayerView.h b/GUI/coregui/Views/SampleDesigner/LayerView.h
index 863b90b769f1666efd7f4063396706c0e17b3926..25aa803e191e0f9b869958d453febe161b58b36e 100644
--- a/GUI/coregui/Views/SampleDesigner/LayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/LayerView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
index 5ba2456d8136828eca69da240e9e5d97a5b73eb8..e9109844a4c94465deec2048fe064503f8c58f67 100644
--- a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
index d2c4446cd3138543d8637f31cda607da516f793f..d29f386004df7eac99f2ac152e780b2d497c8766 100644
--- a/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
+++ b/GUI/coregui/Views/SampleDesigner/MesoCrystalView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke, Dmitry Yurov
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
index fc74cfa94242a3bf7a7a1390e4bbcdbf1a730925..d846e371a158cfc97ab92a7fa9def3847cf08865 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
index 8d79d7f234102e69ecf6373a839a19eda163e022..36d7b321c2f46e775bb7972085bd08eb4fc6bf9e 100644
--- a/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/MultiLayerView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
index 28a8b978a57cb65111aeff1f9f751a1932ca5397..339223ed6b6178488135bffcaee59254ccdf6146 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditor.h b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
index adb5c55e10e2acdabe245b9e0a49f58f696dcb4a..6efedb8cd2dd9ad96e0d330cec9b369b498c6099 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditor.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditor.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
index c5c563ab4a2124e4976897b6ecff025f5691f841..c0568b93425679300b9ce5e94be201d8b54913cb 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
index 724af02ec1107d6ba83f3af1dd12dc43824d24ab..99bdde8396d043ffbea278a7040ab5efbbe206de 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorConnection.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
index ccddf460d97ce9be717fe1df07e806cc155b36bf..f4a5f9b77a4b3767ef737eeeadafe0bec505da55 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
index 1b2479c89e1cc2300f08bdbd9925086064042193..60d5f5e7a68248575c54bcc217d51bf8132350c1 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
index d03cac9924b8010c45c13d0663c927b3c919bc8e..175c7c50ead3b48df740f762cd35e27a1024b0ec 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
index ef678edcae57cec8447ff120354aa77cc601847c..fe8f6d407d43cdfd7152a5aca0eff1ae0668fd6d 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCompositionView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
index 15f7c3712daf35e6af3d0a30d9ce6200a01b94d7..1a74a5e7b96c832daf6e57cfefb05815a5e91de3 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
index 37ad376d3a275f4a5b9a5575397bdd74acb9bf9e..c4871b017daaa8fad2582a0837f9b177631fc49f 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleCoreShellView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
index b2b399dad443dd633eb4ab0f6f30349d438fc754..f415c382240115b0ee08b42b77c91a2ac22a08f0 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
index 7aa509f514aa45bcdb7b9d1d98da8a6da691a502..2831b3afc9bf9c16a72d3086320dc85dedd6db2f 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleDistributionView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
index 89647100d96236ba36c10093955eea4330d67020..f0dc0dbd51323512406d770811c67e2a056ae067 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
index 4f1200489b748f12719bba07bfc8837e2549ecf2..844f0ee4ad964d47e27e328e17b4e1c0864916d4 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleLayoutView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
index 99988fe0c04582c173484e7ce704713674ff75ef..860433845a8c1f5aabd71c78e830cb8cdc1ad468 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/ParticleView.h b/GUI/coregui/Views/SampleDesigner/ParticleView.h
index 2482166b172339baea9f553224ccb41f36e512c7..6b92dbe24c9ac028d14d349737a187d1f73362d1 100644
--- a/GUI/coregui/Views/SampleDesigner/ParticleView.h
+++ b/GUI/coregui/Views/SampleDesigner/ParticleView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
index b5c483693817616c397e4bca4f296d2b5d01f4be..2bac054706c2643ddf11ada4eb7a37422a1596bc 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
index 64c9ce880485e9a739088cdf43feb64ef564a3f0..aa2e56bee95dca275683ff3931ab577d855479f7 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleDesigner.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
index 0501de3259b505c535eab5d3a055eccea7877228..b974947ea25e401bc052fd6fc196e02c9c490f5f 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
index 9a66426f42c6fbb5915eb7b2559f9e8130216aed..3fd74e9d9a662028d504ef226ae98e7ce1df0cef 100644
--- a/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
+++ b/GUI/coregui/Views/SampleDesigner/SamplePropertyWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index 41b58dbf27d9406b4f560793b47944f263163567..a6c344c256c8ff30d69b304ad94d1c78bd5af78e 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
index 923fefe42944add09f49622a6b81d2b090d4afda..094c3aa09246f1887513d02ab23af2ff789dcab2 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
index aa919510759cc460f50b2cf0e54b4a7c682a1957..195b19de1f3d48d45237ab786120379ab2153b66 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
index 626ef15cf08bff6c10cefd06c26b44d5a92a2995..c5a3054cadf64a7d61ae8788911613a38be89e1c 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewAligner.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
index 4dc9071cb49c3cfbb1ff5733c03851e501c13668..4f35be503bbcb3640f2ec0f7b66eafc46d15b7d5 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
index eeaf76d9799dff54d4c904e4658ecc7ebdbf6419..1fff233f596476d752f3655bb46db574c2865e8a 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleViewFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
index 81afa403bb1065c5c8fd9f297a363501381ea784..fa5750c44a83a27ed431e556d3a2e53f7cadd7b8 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
index 402de2e84be1e1a6459633f84a9442292de3f7dd..75b11b9f2890fb2f115d8629d322c5064dd50fc2 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleWidgetBox.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
index 56f3336962f0d6da1bb1b1afb4e11b5443058a92..cc58c32f3d7ba92f5547dfc2509e1e245a153cb3 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleDesigner/TransformationView.h b/GUI/coregui/Views/SampleDesigner/TransformationView.h
index e7da515822fe817bfd832c69824100ae6f20df3b..009d2b2a367aa6eae6f1f610995957ab255298ea 100644
--- a/GUI/coregui/Views/SampleDesigner/TransformationView.h
+++ b/GUI/coregui/Views/SampleDesigner/TransformationView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleView.cpp b/GUI/coregui/Views/SampleView.cpp
index 86aacd922f5d941aef251aecded395e6e61aee76..8ddc0c7406d589a21f90175512d8952be22d4161 100644
--- a/GUI/coregui/Views/SampleView.cpp
+++ b/GUI/coregui/Views/SampleView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleView.h b/GUI/coregui/Views/SampleView.h
index 7524ff796740d65aed760ed227f2a5faefb18f2c..81187e35932b3e71047bb971ff9a5d4200830a6e 100644
--- a/GUI/coregui/Views/SampleView.h
+++ b/GUI/coregui/Views/SampleView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleViewComponents.cpp b/GUI/coregui/Views/SampleViewComponents.cpp
index c5eefe1cc9555e1330ab537f18d76ea590ae625c..c0ef695d68faa7d14196ca76213e2e9c357d1c36 100644
--- a/GUI/coregui/Views/SampleViewComponents.cpp
+++ b/GUI/coregui/Views/SampleViewComponents.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SampleViewComponents.h b/GUI/coregui/Views/SampleViewComponents.h
index 8e2a8e551a25502186a87b7bda44c927b4e59bdc..200de6e8da3d9f176463e81bd213caee7c2efd56 100644
--- a/GUI/coregui/Views/SampleViewComponents.h
+++ b/GUI/coregui/Views/SampleViewComponents.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SessionModelView.cpp b/GUI/coregui/Views/SessionModelView.cpp
index be0808f13c38d851f16c474c6ff96156e90ad990..b3468e642872d057ab64bbc8a5153b4fadba27be 100644
--- a/GUI/coregui/Views/SessionModelView.cpp
+++ b/GUI/coregui/Views/SessionModelView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SessionModelView.h b/GUI/coregui/Views/SessionModelView.h
index fc8856c6dc1a70cece21878241f86c8877171730..7c0839f3802274be3c425259f62286b0b36e2c17 100644
--- a/GUI/coregui/Views/SessionModelView.h
+++ b/GUI/coregui/Views/SessionModelView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationView.cpp b/GUI/coregui/Views/SimulationView.cpp
index 5ae271198fe1c7c0af3abebcce974bb5d97c6480..e61bfa6d23888a7d392b591791457ea8615d57ca 100644
--- a/GUI/coregui/Views/SimulationView.cpp
+++ b/GUI/coregui/Views/SimulationView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationView.h b/GUI/coregui/Views/SimulationView.h
index d1988c29b36fbbb9603d4181d378e2fd58258426..5b5ffbbc3a7ca397f41b95174a40a57f84353e41 100644
--- a/GUI/coregui/Views/SimulationView.h
+++ b/GUI/coregui/Views/SimulationView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index b26b2aeb98ab027c3787cd0426e02e0cb0a3a190..8639e133ba792fafec4d21fffd951f2958760b17 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
index 7206d7c9e989df07196900fc42d6ab352c7f06b8..a9f5c591dc17c37db2c2fee2264f1da5fe291a9c 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
index 45aaf8dbc1e9e7ed851b0454323f7f4e2e194624..cfde6f95b3ec70a05a500e16283ec7d482d0aedf 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
index faaf19678c59a5543af705c7714fe72f1a66e9f6..ccc2d434e6d7f4fe86dc20104b20be25542c4b44 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationDataSelectorWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
index 38c2675f54eef202c33722acd4fff76344c3ebd5..c7c1c93d6f787dfed7bf8666f2212ecb16e12479 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
index 7ac893770670819fac9a847038a76ede8ccb186c..2e1acd0e4798014b1de30446908c2297881974d2 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationOptionsWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
index 475a0106a0db794588fb3f401afdc7ce7f0eff08..d1d1d84cc4a2dc2667ebd7d90903c4c86b627410 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
index 4a0c23817569dfb4cda89da881e6b2b507dbb616..4f51b6b50023bc3a63c0cbd1b0d461348847117d 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
index b10dfb57447d530dd9156545272503425cfe3b05..f7236ebdec0b9d9521f6012404b792ce43a0486e 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
index 6870391cf632f8edfa44793b435f367933aa017e..338c7d09720fc9efc4c117ff5e34ce590cbefb0c 100644
--- a/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/SimulationSetupWidget.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index 7cbbb7eebcbc00cc8916a7014304e97420f9bf7a..fcdbc0990f968239392b5e8e92ab3d67b3ccf624 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/TestView.h b/GUI/coregui/Views/TestView.h
index 4c952b84d88f69a7e327ec4d329e0285f3c7e18e..41e5a044f50e481e605e9e552e89f13e437fbea2 100644
--- a/GUI/coregui/Views/TestView.h
+++ b/GUI/coregui/Views/TestView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/WelcomeView.cpp b/GUI/coregui/Views/WelcomeView.cpp
index 2b9918a69ae8d7e11288a47e0bc70e8727df78e4..9cf3f6198440c7a9bc04c9e108746f396854655c 100644
--- a/GUI/coregui/Views/WelcomeView.cpp
+++ b/GUI/coregui/Views/WelcomeView.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/Views/WelcomeView.h b/GUI/coregui/Views/WelcomeView.h
index ca4c7dbd12707840835576c402611c32cf800af0..7c3ada0576a41772703e2b0cf331dadae8ec6180 100644
--- a/GUI/coregui/Views/WelcomeView.h
+++ b/GUI/coregui/Views/WelcomeView.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/AppSvc.cpp b/GUI/coregui/mainwindow/AppSvc.cpp
index c98c0518023250cf0431dd4831e20640c5761634..3c3579e6051a7e22252c895e96078ec2a28e1390 100644
--- a/GUI/coregui/mainwindow/AppSvc.cpp
+++ b/GUI/coregui/mainwindow/AppSvc.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/AppSvc.h b/GUI/coregui/mainwindow/AppSvc.h
index 322f8ec924a81a36c494c7318e2451cd63805d73..bfeff2df83ee70b2a9eb3f83a2002aaf25fe78ef 100644
--- a/GUI/coregui/mainwindow/AppSvc.h
+++ b/GUI/coregui/mainwindow/AppSvc.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/AutosaveController.cpp b/GUI/coregui/mainwindow/AutosaveController.cpp
index c22f339c26df4eb7722f8f64ba0661a55b998fc9..da05798709e7ca1842d0ebfbd31c7e3c70e271b5 100644
--- a/GUI/coregui/mainwindow/AutosaveController.cpp
+++ b/GUI/coregui/mainwindow/AutosaveController.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/AutosaveController.h b/GUI/coregui/mainwindow/AutosaveController.h
index 1933a7d2ede6c6c20d228fdb07087c80a2cdb161..78601875ac6fd09f533b7fc40bd595a0fa931fe0 100644
--- a/GUI/coregui/mainwindow/AutosaveController.h
+++ b/GUI/coregui/mainwindow/AutosaveController.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.cpp b/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
index 32a21b8a9f1c8ebe11371ba937fde2442a108c8d..3ed11ba0259392149ba738ac1a2939067aa96eaf 100644
--- a/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
+++ b/GUI/coregui/mainwindow/OutputDataIOHistory.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/OutputDataIOHistory.h b/GUI/coregui/mainwindow/OutputDataIOHistory.h
index d6cb8959e5a3239393220c68e4eb17e64dee7f1b..f37489d22747ccee0866fa5626679890f7637322 100644
--- a/GUI/coregui/mainwindow/OutputDataIOHistory.h
+++ b/GUI/coregui/mainwindow/OutputDataIOHistory.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.cpp b/GUI/coregui/mainwindow/OutputDataIOService.cpp
index ef9044246e8d72f3d204c36fc0951685d19e6184..6e0f28b0de074d1e9fad35ff7c56a6fcf7bcbedf 100644
--- a/GUI/coregui/mainwindow/OutputDataIOService.cpp
+++ b/GUI/coregui/mainwindow/OutputDataIOService.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/OutputDataIOService.h b/GUI/coregui/mainwindow/OutputDataIOService.h
index 7b600865baaa75bee9d6c9bd2049bcbc7d7bdfa0..8f81027d6ca7f9b80a58375fb57b7a7d2d9b7d3f 100644
--- a/GUI/coregui/mainwindow/OutputDataIOService.h
+++ b/GUI/coregui/mainwindow/OutputDataIOService.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/ProjectFlags.h b/GUI/coregui/mainwindow/ProjectFlags.h
index 6c2aeb68537568f7e5c4293d3d5d6f7a222f666f..44ff10daef0e65a28457f20e1b0506f54502e4b2 100644
--- a/GUI/coregui/mainwindow/ProjectFlags.h
+++ b/GUI/coregui/mainwindow/ProjectFlags.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/ProjectUtils.cpp b/GUI/coregui/mainwindow/ProjectUtils.cpp
index 9144d0f94445c74e58f4a977f4ad54f2ded81aa0..4fb5784ebd50e8c0cb346ab642cc657c1d7df57f 100644
--- a/GUI/coregui/mainwindow/ProjectUtils.cpp
+++ b/GUI/coregui/mainwindow/ProjectUtils.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/ProjectUtils.h b/GUI/coregui/mainwindow/ProjectUtils.h
index 984d5e6439918d2d11e4bc34a04dd2698cbd1606..f5fb807119beb31cc30a2feb5e1db01e70a26da3 100644
--- a/GUI/coregui/mainwindow/ProjectUtils.h
+++ b/GUI/coregui/mainwindow/ProjectUtils.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/coregui/mainwindow/PyImportAssistant.cpp
index 1fc6e739aabc4c1c5238b502e966acc0a65941c0..7b8806c5e304b837a29884261e81539df2e5afd0 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.cpp
+++ b/GUI/coregui/mainwindow/PyImportAssistant.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.h b/GUI/coregui/mainwindow/PyImportAssistant.h
index b3f03f1c4115fa5f72dfba6a1490fd738978eb7c..43fc0f36b9e699c54789e6b6afd1a823bb8865c6 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.h
+++ b/GUI/coregui/mainwindow/PyImportAssistant.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SaveService.cpp b/GUI/coregui/mainwindow/SaveService.cpp
index fa5d2f8bc8884dd4eb591a063ab298447d6d1dba..85c2718ae6996d228ecc257900eae506059f4182 100644
--- a/GUI/coregui/mainwindow/SaveService.cpp
+++ b/GUI/coregui/mainwindow/SaveService.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SaveService.h b/GUI/coregui/mainwindow/SaveService.h
index f17894f733c00a784543ba70b69c83827b066e43..7a3a1ab90797ec31c23749d38b176032459dac27 100644
--- a/GUI/coregui/mainwindow/SaveService.h
+++ b/GUI/coregui/mainwindow/SaveService.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SaveThread.cpp b/GUI/coregui/mainwindow/SaveThread.cpp
index f66af182d1bef21cff3ed8fd52104228f19e829e..d841af1cf28729e991e86e201a7c95a09280d0fb 100644
--- a/GUI/coregui/mainwindow/SaveThread.cpp
+++ b/GUI/coregui/mainwindow/SaveThread.cpp
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SaveThread.h b/GUI/coregui/mainwindow/SaveThread.h
index 1afe1fa8f451b375c280f83e39fd8c43d8f19c0b..ae19d9153bbcf4bef7a4c0c3b3b8fa32d877e91c 100644
--- a/GUI/coregui/mainwindow/SaveThread.h
+++ b/GUI/coregui/mainwindow/SaveThread.h
@@ -7,9 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2017
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   J. Burle, J. M. Fisher, M. Ganeva, G. Pospelov, W. Van Herck, J. Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SplashScreen.cpp b/GUI/coregui/mainwindow/SplashScreen.cpp
index 5806d609957364393f0efeb251fe9aa5c39ae74c..cf93a2429250f6c65ef0e6474a8646794c820daf 100644
--- a/GUI/coregui/mainwindow/SplashScreen.cpp
+++ b/GUI/coregui/mainwindow/SplashScreen.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/SplashScreen.h b/GUI/coregui/mainwindow/SplashScreen.h
index 6bb03264324a5b98f43358967642c6e1f7336968..10b0888ff10d282c313664052990c04831f38349 100644
--- a/GUI/coregui/mainwindow/SplashScreen.h
+++ b/GUI/coregui/mainwindow/SplashScreen.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/StyledToolBar.cpp b/GUI/coregui/mainwindow/StyledToolBar.cpp
index b6023f0a68733e4111c72468482f94bebb122dbc..6417d1c94425e09abbf8829672e85b759d402a80 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.cpp
+++ b/GUI/coregui/mainwindow/StyledToolBar.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/StyledToolBar.h b/GUI/coregui/mainwindow/StyledToolBar.h
index 753e2e3cf3138e41f66d2c59119c8d042cfa24f0..97ceb76f4a6337131e6da53e2f5237033e87bf68 100644
--- a/GUI/coregui/mainwindow/StyledToolBar.h
+++ b/GUI/coregui/mainwindow/StyledToolBar.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index 9ab605647e0247b6586a8e517839a39a5966e6bb..94128f8f27ceb0844792363fcd8f7161255ae29e 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.h b/GUI/coregui/mainwindow/UpdateNotifier.h
index 671bab95c07a5043f86928437ac7abd5019cec98..601021ee2a9a235463f4aa0d3826656d4001cca6 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.h
+++ b/GUI/coregui/mainwindow/UpdateNotifier.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
index ec33aaed1dcd554b7146cd7349962e544a445e2d..90a8730328d0cc2b1bc66dcd51d78f0dafeaa53a 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/aboutapplicationdialog.h b/GUI/coregui/mainwindow/aboutapplicationdialog.h
index 88a8c8a406645368d5e57f1938caa937e36e3c97..16ce1e709a8e2f71c951cc340a5639daed93fb40 100644
--- a/GUI/coregui/mainwindow/aboutapplicationdialog.h
+++ b/GUI/coregui/mainwindow/aboutapplicationdialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/actionmanager.cpp b/GUI/coregui/mainwindow/actionmanager.cpp
index 8ee7a2aa5f884b29d6a6bf72e1c03c7024924aea..650ba7ac351f7212ba0e5dd217bbfa1c3eafd2a7 100644
--- a/GUI/coregui/mainwindow/actionmanager.cpp
+++ b/GUI/coregui/mainwindow/actionmanager.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/actionmanager.h b/GUI/coregui/mainwindow/actionmanager.h
index e49a1ff664643cec3c26b7e729ff43599b8fc891..2a54b6f32dc4b538e8f6c37e374f45b7bb2e4bc3 100644
--- a/GUI/coregui/mainwindow/actionmanager.h
+++ b/GUI/coregui/mainwindow/actionmanager.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/mainwindow.cpp b/GUI/coregui/mainwindow/mainwindow.cpp
index 196b1130d8ab50a7baa28961ca8583ad0de21c92..821a2ea46e2c6210d16fa63898a64ba7ca8a4db2 100644
--- a/GUI/coregui/mainwindow/mainwindow.cpp
+++ b/GUI/coregui/mainwindow/mainwindow.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/mainwindow.h b/GUI/coregui/mainwindow/mainwindow.h
index 03daa235adecfab5f74da6420da14f01b80fdd43..f6689b0d45cf939a66f4c6f72584200c89f66f49 100644
--- a/GUI/coregui/mainwindow/mainwindow.h
+++ b/GUI/coregui/mainwindow/mainwindow.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/mainwindow_constants.h b/GUI/coregui/mainwindow/mainwindow_constants.h
index 4b32dd76b90d4f2063ed38c974bd250035de7789..aa74ec702237cb4eb54bb93edc44c65c38b7ab23 100644
--- a/GUI/coregui/mainwindow/mainwindow_constants.h
+++ b/GUI/coregui/mainwindow/mainwindow_constants.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/newprojectdialog.cpp b/GUI/coregui/mainwindow/newprojectdialog.cpp
index d71d831159f5849b6f85851c52930eaa849444ef..57ecf8a8e7d8ee2d6b2066d0e8f6439b6e6f9b96 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.cpp
+++ b/GUI/coregui/mainwindow/newprojectdialog.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/newprojectdialog.h b/GUI/coregui/mainwindow/newprojectdialog.h
index 2e8d4c949635bc813ff97327b464f20d9cf4cb19..e72cd2a551c1c6da567bf124e6afb5de4881b0ed 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.h
+++ b/GUI/coregui/mainwindow/newprojectdialog.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index a6f72298f0dcb79353cb11741536e5b23a74c981..4d7433f612a442eaad13be9a5391395c78459757 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/coregui/mainwindow/projectdocument.h
index d7000dfa6083304729edebfbdb7ebb5afc5a3e5a..b0732383a8bf700ab9ba259c92b0294fb232060d 100644
--- a/GUI/coregui/mainwindow/projectdocument.h
+++ b/GUI/coregui/mainwindow/projectdocument.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index cb85cc73b7aea93b776215d560af458fe6c7c982..a976f8a653b32c24b26a54ae75b7ab94fe998213 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/projectmanager.h b/GUI/coregui/mainwindow/projectmanager.h
index f879c4c2c8c9cbeec236f145bb69c80f272b1410..6c56682fbe55b9e46faf5deb610e35d8ab8b8a3c 100644
--- a/GUI/coregui/mainwindow/projectmanager.h
+++ b/GUI/coregui/mainwindow/projectmanager.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.cpp b/GUI/coregui/mainwindow/tooltipdatabase.cpp
index c228a7e97be6b466698149f9e08a8522819c465c..ffc7c815364c1d04d8776d0b69536df01f3b30d9 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.cpp
+++ b/GUI/coregui/mainwindow/tooltipdatabase.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/mainwindow/tooltipdatabase.h b/GUI/coregui/mainwindow/tooltipdatabase.h
index 9ffbc3fcb404d0fc2c5541bd6271cace2dc24f2b..f06be6b76a21eece3e7387bf3b6dbf5e75cd1faf 100644
--- a/GUI/coregui/mainwindow/tooltipdatabase.h
+++ b/GUI/coregui/mainwindow/tooltipdatabase.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/CustomEventFilters.cpp b/GUI/coregui/utils/CustomEventFilters.cpp
index 3755e5cd1bb501b6f5499c6aa69746190807ce27..7db3a01db1787ce8b7f161158e6643c515dc36b5 100644
--- a/GUI/coregui/utils/CustomEventFilters.cpp
+++ b/GUI/coregui/utils/CustomEventFilters.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/CustomEventFilters.h b/GUI/coregui/utils/CustomEventFilters.h
index e8a9b77d9eaa1cc48f11985eb7e1ef02390d9895..60928dc25025c58e5d3c3dd35184f7d680288609 100644
--- a/GUI/coregui/utils/CustomEventFilters.h
+++ b/GUI/coregui/utils/CustomEventFilters.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/FancyLabel.cpp b/GUI/coregui/utils/FancyLabel.cpp
index 6349a2266ed26286c366018034afcf2f2ab27a71..1d72b96dec032a471290d5fead0215e33777e12a 100644
--- a/GUI/coregui/utils/FancyLabel.cpp
+++ b/GUI/coregui/utils/FancyLabel.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/FancyLabel.h b/GUI/coregui/utils/FancyLabel.h
index eae59fd3d6a60880ff306a5dc5284036dbe6ca8f..aed8f6698a6920c03758c5e31eb43ea8a04d89b9 100644
--- a/GUI/coregui/utils/FancyLabel.h
+++ b/GUI/coregui/utils/FancyLabel.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp
index 87ac357c4f9963162365f25e6c6e22107190fabd..eace95b687ca13f8f743a26df83e5440abc002f4 100644
--- a/GUI/coregui/utils/GUIHelpers.cpp
+++ b/GUI/coregui/utils/GUIHelpers.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h
index 7252a0c16ca88a6189b1d5a5a9056903433caba6..c67be1313a0057e4e66913a4669a8e8d4e29775f 100644
--- a/GUI/coregui/utils/GUIHelpers.h
+++ b/GUI/coregui/utils/GUIHelpers.h
@@ -1,4 +1,4 @@
-//* ************************************************************************* //
+// ************************************************************************** //
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
@@ -7,12 +7,10 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
-//* ************************************************************************* //
+// ************************************************************************** //
 
 #ifndef GUIHELPERS_H
 #define GUIHELPERS_H
diff --git a/GUI/coregui/utils/GUIMessage.cpp b/GUI/coregui/utils/GUIMessage.cpp
index ab8e14cddbc835131756feb9c7994e178809eee9..9772e4500d9c2399ba66386e20cc380a1e9684ca 100644
--- a/GUI/coregui/utils/GUIMessage.cpp
+++ b/GUI/coregui/utils/GUIMessage.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/GUIMessage.h b/GUI/coregui/utils/GUIMessage.h
index bc487ae970ad7d116e7dd09cf108edbd0d230489..f9eb7b84b10b0cc1a842e8f11136f36a8b59175a 100644
--- a/GUI/coregui/utils/GUIMessage.h
+++ b/GUI/coregui/utils/GUIMessage.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/ItemIDFactory.cpp b/GUI/coregui/utils/ItemIDFactory.cpp
index 48972df1a9df76ea72fbfc7c658cca5b23dee9fe..3fcda474a3e8caea170f0e321bd3cb6e22eee108 100644
--- a/GUI/coregui/utils/ItemIDFactory.cpp
+++ b/GUI/coregui/utils/ItemIDFactory.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/ItemIDFactory.h b/GUI/coregui/utils/ItemIDFactory.h
index cecd98eabc50bd8e9d3d43c82cc4101f7149aab0..82354934f8f5863a9f77928df19276b6d9b6f480 100644
--- a/GUI/coregui/utils/ItemIDFactory.h
+++ b/GUI/coregui/utils/ItemIDFactory.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/LayoutUtils.cpp b/GUI/coregui/utils/LayoutUtils.cpp
index 25b3227680c8f9e033d04dc683d0342122f0d7f4..22e9caab06225f9ee5f3ea9a929332415bc80d0b 100644
--- a/GUI/coregui/utils/LayoutUtils.cpp
+++ b/GUI/coregui/utils/LayoutUtils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/LayoutUtils.h b/GUI/coregui/utils/LayoutUtils.h
index 5d65c5bd216b6127c1f495615d72b9cbce6f9b9e..a7fad5cc7042747ffd57d15d6487f17075868c14 100644
--- a/GUI/coregui/utils/LayoutUtils.h
+++ b/GUI/coregui/utils/LayoutUtils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/MessageService.cpp b/GUI/coregui/utils/MessageService.cpp
index 1eb217785015e0d228402bb099c4727ab4f32660..a729eb2a5836ba021a9533ca0a5ad3ec9b7ae2f5 100644
--- a/GUI/coregui/utils/MessageService.cpp
+++ b/GUI/coregui/utils/MessageService.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/MessageService.h b/GUI/coregui/utils/MessageService.h
index c7f01a56ad5b4357f86d988242de46886a2a4a0a..0f451d2b8901a576863efeec055f19409f9949d4 100644
--- a/GUI/coregui/utils/MessageService.h
+++ b/GUI/coregui/utils/MessageService.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/StyleUtils.cpp b/GUI/coregui/utils/StyleUtils.cpp
index 349c745a84ba2d69cf78c228354653cae4b87bda..5b9aa4db4df081d628cd6a8249d90303795502c2 100644
--- a/GUI/coregui/utils/StyleUtils.cpp
+++ b/GUI/coregui/utils/StyleUtils.cpp
@@ -1,4 +1,4 @@
-//* ************************************************************************* //
+// ************************************************************************** //
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
@@ -7,12 +7,10 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
-//* ************************************************************************* //
+// ************************************************************************** //
 
 #include "StyleUtils.h"
 #include <QTreeView>
diff --git a/GUI/coregui/utils/StyleUtils.h b/GUI/coregui/utils/StyleUtils.h
index c6d3300a4373d53213d54a2db1874fb8ddc78434..cd8f880612fce2868f34db731458e048cdae0463 100644
--- a/GUI/coregui/utils/StyleUtils.h
+++ b/GUI/coregui/utils/StyleUtils.h
@@ -1,4 +1,4 @@
-//* ************************************************************************* //
+// ************************************************************************** //
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
@@ -7,12 +7,10 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
-//* ************************************************************************* //
+// ************************************************************************** //
 
 #ifndef STYLEUTILS_H
 #define STYLEUTILS_H
diff --git a/GUI/coregui/utils/hostosinfo.h b/GUI/coregui/utils/hostosinfo.h
index e1d0cf2e04694e6b460e65808f694c9bc3630d9f..e2bce9f63e7ed7bca201eea27c75a3216677aaa7 100644
--- a/GUI/coregui/utils/hostosinfo.h
+++ b/GUI/coregui/utils/hostosinfo.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/qstringutils.cpp b/GUI/coregui/utils/qstringutils.cpp
index 1cf1a1f500a9856f90d15860e3af96f5afeda18c..5553e5da57d16f7b280059921969d22121f3a589 100644
--- a/GUI/coregui/utils/qstringutils.cpp
+++ b/GUI/coregui/utils/qstringutils.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/coregui/utils/qstringutils.h b/GUI/coregui/utils/qstringutils.h
index bd0401cbf8491046310e0b0f0821bea6deab02ea..8acaff679523e9e6fc58ea8c54bcafb3fbe553f6 100644
--- a/GUI/coregui/utils/qstringutils.h
+++ b/GUI/coregui/utils/qstringutils.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/main/appoptions.cpp b/GUI/main/appoptions.cpp
index aa9caf34d7bcb35cd967ff8f36aea8acdcc38f97..69ce91c9627ec2548d96ddd02148852839379888 100644
--- a/GUI/main/appoptions.cpp
+++ b/GUI/main/appoptions.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/main/appoptions.h b/GUI/main/appoptions.h
index b0370604602da4a4cf580971b4c34aad50cc7110..e4e03f41e771d8f92ed922880f77b187e0ea0084 100644
--- a/GUI/main/appoptions.h
+++ b/GUI/main/appoptions.h
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/GUI/main/main.cpp b/GUI/main/main.cpp
index b3b983ff8f249a836e1b8aff4135fcfbbacbfab7..b9302fe21f75de23d64b87d27cdf78adb0de0855 100644
--- a/GUI/main/main.cpp
+++ b/GUI/main/main.cpp
@@ -7,10 +7,8 @@
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum JÃ¼lich GmbH 2016
-//! @authors   Scientific Computing Group at MLZ Garching
-//! @authors   CÃ©line Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors   Walter Van Herck, Joachim Wuttke
+//! @copyright Forschungszentrum JÃ¼lich GmbH 2018
+//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)
 //
 // ************************************************************************** //
 
diff --git a/dev-tools/edit/update-sourcecode-header.py b/dev-tools/edit/update-sourcecode-header.py
index 9c248a2a78e0d3a7ed7063263742a334337ea1bd..7e686789a82b1877678020d52207f6999a3e338d 100644
--- a/dev-tools/edit/update-sourcecode-header.py
+++ b/dev-tools/edit/update-sourcecode-header.py
@@ -27,17 +27,15 @@ header_top = [
     u"//                                                                              "
     ]
 header_center = [
-    u"//! @file      dev-tools/edit/update-sourcecode-header.py
+    u"//! @file      dev-tools/edit/update-sourcecode-header.py                       "
     u"//! @brief     Defines class Beam                                               "
     ]
 header_bottom = [
     u"//!                                                                             ",
     u"//! @homepage  http://www.bornagainproject.org                                  ",
     u"//! @license   GNU General Public License v3 or higher (see COPYING)            ",
-    u"//! @copyright Forschungszentrum J\u00fclich GmbH 2016                          ",
-    u"//! @authors   Scientific Computing Group at MLZ Garching                       ",
-    u"//! @authors   C\u00E9line Durniak, Marina Ganeva, David Li, Gennady Pospelov   ",
-    u"//! @authors   Walter Van Herck, Joachim Wuttke                                 ",
+    u"//! @copyright Forschungszentrum J\u00fclich GmbH 2018                          ",
+    u"//! @authors   Scientific Computing Group at MLZ (see CITATION, AUTHORS)        ",
     u"//                                                                              ",
     u"// ************************************************************************** //"
     ]