From 88f54b8bf6e02817cc9ac082bfb1fcd54a3efd7e Mon Sep 17 00:00:00 2001
From: Tim Keil <tim.keil@wwu.de>
Date: Mon, 3 Dec 2018 15:45:28 +0100
Subject: [PATCH] [license] update Licence

---
 .gitsuper                                                     | 4 ++--
 .mailmap                                                      | 2 ++
 CMakeLists.txt                                                | 2 +-
 cmake/modules/DuneXtFunctionsMacros.cmake                     | 1 +
 dune/xt/functions/CMakeLists.txt                              | 2 +-
 dune/xt/functions/ESV2007.hh                                  | 2 +-
 dune/xt/functions/base/combined-functions.hh                  | 3 ++-
 dune/xt/functions/base/combined-grid-functions.hh             | 3 ++-
 dune/xt/functions/base/composition.hh                         | 2 +-
 dune/xt/functions/base/derived.hh                             | 2 +-
 dune/xt/functions/base/function-as-grid-function.hh           | 2 +-
 dune/xt/functions/base/reinterpret.hh                         | 2 +-
 dune/xt/functions/base/sliced.hh                              | 2 +-
 dune/xt/functions/base/transformed.hh                         | 2 +-
 dune/xt/functions/base/visualization.hh                       | 2 +-
 dune/xt/functions/checkerboard.hh                             | 2 +-
 dune/xt/functions/constant.hh                                 | 2 +-
 dune/xt/functions/exceptions.hh                               | 3 ++-
 dune/xt/functions/expression.hh                               | 2 +-
 dune/xt/functions/expression/base.hh                          | 2 +-
 dune/xt/functions/expression/default.hh                       | 2 +-
 dune/xt/functions/expression/mathexpr.cc                      | 2 +-
 dune/xt/functions/expression/parametric.hh                    | 2 +-
 dune/xt/functions/flattop.hh                                  | 2 +-
 dune/xt/functions/generic/function.hh                         | 2 +-
 dune/xt/functions/generic/grid-function.hh                    | 2 +-
 dune/xt/functions/indicator.hh                                | 2 +-
 dune/xt/functions/interfaces/element-functions.hh             | 2 +-
 dune/xt/functions/interfaces/function.hh                      | 3 ++-
 dune/xt/functions/interfaces/grid-function.hh                 | 2 +-
 dune/xt/functions/spe10/model1.hh                             | 2 +-
 dune/xt/functions/spe10/model2.hh                             | 2 +-
 dune/xt/functions/test/CMakeLists.txt                         | 2 +-
 dune/xt/functions/test/ESV2007_cutoff_1d.py                   | 3 ++-
 dune/xt/functions/test/ESV2007_cutoff_2d_3d.py                | 3 ++-
 dune/xt/functions/test/ESV2007_exact_solution.py              | 3 ++-
 dune/xt/functions/test/ESV2007_force.py                       | 3 ++-
 dune/xt/functions/test/checkerboard.py                        | 3 ++-
 dune/xt/functions/test/constant.py                            | 3 ++-
 dune/xt/functions/test/difference.py                          | 3 ++-
 dune/xt/functions/test/disabled_affine.cc                     | 2 +-
 dune/xt/functions/test/disabled_affine_flux.cc                | 2 +-
 .../xt/functions/test/disabled_lambda_global_flux_function.cc | 2 +-
 dune/xt/functions/test/disabled_lambda_local_flux_function.cc | 2 +-
 dune/xt/functions/test/expression_matrix_valued.py            | 3 ++-
 dune/xt/functions/test/expression_parametric.py               | 3 ++-
 dune/xt/functions/test/expression_vector_valued.py            | 3 ++-
 dune/xt/functions/test/flattop.py                             | 3 ++-
 dune/xt/functions/test/grids.py                               | 3 ++-
 dune/xt/functions/test/lambda_function.py                     | 3 ++-
 dune/xt/functions/test/lambda_grid_function.py                | 3 ++-
 dune/xt/functions/test/product.py                             | 3 ++-
 dune/xt/functions/test/spe10_model1.py                        | 3 ++-
 dune/xt/functions/test/spe10_model2.py                        | 3 ++-
 dune/xt/functions/test/sum_for_functions.py                   | 3 ++-
 dune/xt/functions/test/sum_for_grid_functions.py              | 3 ++-
 dune/xt/functions/type_traits.hh                              | 2 +-
 python/dune/xt/CMakeLists.txt                                 | 2 +-
 python/dune/xt/bindings.cc                                    | 2 +-
 python/dune/xt/functions/ESV2007.bindings.hh                  | 2 +-
 python/dune/xt/functions/__init__.py                          | 2 +-
 python/dune/xt/functions/checkerboard.hh                      | 2 +-
 python/dune/xt/functions/constant.hh                          | 2 +-
 python/dune/xt/functions/expression.hh                        | 2 +-
 python/dune/xt/functions/indicator.hh                         | 2 +-
 python/dune/xt/functions/interfaces.hh                        | 2 +-
 python/dune/xt/functions/spe10.hh                             | 2 +-
 python/dune/xt/interfaces.cc                                  | 2 +-
 python/setup.cfg                                              | 2 +-
 python/test/constant.py                                       | 3 ++-
 70 files changed, 96 insertions(+), 69 deletions(-)

diff --git a/.gitsuper b/.gitsuper
index 94ff1333b..221b29195 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -14,7 +14,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004)
 	+bf48b2929a26dc043925c41672570600b936f032 dune-xt-common (heads/fix_issue_149)
 	 cad4071f7722374d5131c21244970e93c98ad6ba dune-xt-data (remotes/origin/HEAD)
-	+918ff8a904c95a077270b094be5de5eb084c912c dune-xt-functions (heads/update_indicator_tests)
+	+0bdb4e53bdc193530299611b01c35ed152b4cc8d dune-xt-functions (heads/update_license)
 	 08242248ae7d1e79018fc2e91e85bccdd453107a dune-xt-grid (remotes/origin/HEAD)
 	 0c3b93e32d48b7b389db1c3572d567bff272190c dune-xt-la (remotes/origin/HEAD)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
@@ -93,7 +93,7 @@ commit = cad4071f7722374d5131c21244970e93c98ad6ba
 [submodule.dune-xt-functions]
 remote = https://github.com/dune-community/dune-xt-functions.git
 status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
-commit = 918ff8a904c95a077270b094be5de5eb084c912c
+commit = 0bdb4e53bdc193530299611b01c35ed152b4cc8d
 
 [submodule.dune-xt-grid]
 remote = https://github.com/dune-community/dune-xt-grid.git
diff --git a/.mailmap b/.mailmap
index cba7dc2ed..eef28a16c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,8 @@ Stefan Girke <stefan.girke@gmx.de> Stefan <stefan@stefan.(none)>
 Tobias Leibner <tobias.leibner@uni-muenster.de> tobiasleibner <tobias.leibner@googlemail.com>
 Tobias Leibner <tobias.leibner@uni-muenster.de> Tobias Leibner <tobias.leibner@googlemail.com>
 Barbara Verfürth <b_verf01@uni-muenster.de> b_verf01 <b_verf01@uni-muenster.de>
+Tim Keil <tim.keil@wwu.de> Tim Keil <tim.keil@wwu.de>
+Tim Keil <tim.keil@wwu.de> TiKeil <keil.menden@web.de>
 
 # geratene duneadm zuordnung
 René Fritze <rene.fritze@wwu.de> Mario Ohlberger <duneadm@DUNE-PROJECT.(none)>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fcb8e074..1a2cd1da7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016 - 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/cmake/modules/DuneXtFunctionsMacros.cmake b/cmake/modules/DuneXtFunctionsMacros.cmake
index 877bedfec..a85324bd5 100644
--- a/cmake/modules/DuneXtFunctionsMacros.cmake
+++ b/cmake/modules/DuneXtFunctionsMacros.cmake
@@ -12,3 +12,4 @@
 #
 # File for module specific CMake tests.
 # ~~~
+
diff --git a/dune/xt/functions/CMakeLists.txt b/dune/xt/functions/CMakeLists.txt
index 6fde26f4e..71209d039 100644
--- a/dune/xt/functions/CMakeLists.txt
+++ b/dune/xt/functions/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016, 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/dune/xt/functions/ESV2007.hh b/dune/xt/functions/ESV2007.hh
index d3ab8fdf6..72421eb54 100644
--- a/dune/xt/functions/ESV2007.hh
+++ b/dune/xt/functions/ESV2007.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2018)
 
 #ifndef DUNEXT_FUNCTIONS_ESV2007_HH
diff --git a/dune/xt/functions/base/combined-functions.hh b/dune/xt/functions/base/combined-functions.hh
index c8becaa5a..7f449ebbc 100644
--- a/dune/xt/functions/base/combined-functions.hh
+++ b/dune/xt/functions/base/combined-functions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 //
 // reserved.
diff --git a/dune/xt/functions/base/combined-grid-functions.hh b/dune/xt/functions/base/combined-grid-functions.hh
index 1463b146c..49e63febf 100644
--- a/dune/xt/functions/base/combined-grid-functions.hh
+++ b/dune/xt/functions/base/combined-grid-functions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 //
 // reserved.
diff --git a/dune/xt/functions/base/composition.hh b/dune/xt/functions/base/composition.hh
index c8ef3df87..21b187e28 100644
--- a/dune/xt/functions/base/composition.hh
+++ b/dune/xt/functions/base/composition.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2016 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2016 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_COMPOSITION_HH
diff --git a/dune/xt/functions/base/derived.hh b/dune/xt/functions/base/derived.hh
index 66d0ca82e..5128df132 100644
--- a/dune/xt/functions/base/derived.hh
+++ b/dune/xt/functions/base/derived.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2015 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_DERIVED_HH
diff --git a/dune/xt/functions/base/function-as-grid-function.hh b/dune/xt/functions/base/function-as-grid-function.hh
index 59d7bd3a6..46036fb55 100644
--- a/dune/xt/functions/base/function-as-grid-function.hh
+++ b/dune/xt/functions/base/function-as-grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2017 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_FUNCTION_AS_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/base/reinterpret.hh b/dune/xt/functions/base/reinterpret.hh
index 74223ded2..8dae257d3 100644
--- a/dune/xt/functions/base/reinterpret.hh
+++ b/dune/xt/functions/base/reinterpret.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2016 - 2018)
 
 #ifndef DUNE_XT_FUNCTION_BASE_REINTERPRET_HH
diff --git a/dune/xt/functions/base/sliced.hh b/dune/xt/functions/base/sliced.hh
index c2f6bb452..499e1d766 100644
--- a/dune/xt/functions/base/sliced.hh
+++ b/dune/xt/functions/base/sliced.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_SLICED_HH
 #define DUNE_XT_FUNCTIONS_BASE_SLICED_HH
diff --git a/dune/xt/functions/base/transformed.hh b/dune/xt/functions/base/transformed.hh
index b70885a3d..a0c80521d 100644
--- a/dune/xt/functions/base/transformed.hh
+++ b/dune/xt/functions/base/transformed.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_TRANSFORMED_HH
 #define DUNE_XT_FUNCTIONS_BASE_TRANSFORMED_HH
diff --git a/dune/xt/functions/base/visualization.hh b/dune/xt/functions/base/visualization.hh
index c61976fa2..cfbbb0534 100644
--- a/dune/xt/functions/base/visualization.hh
+++ b/dune/xt/functions/base/visualization.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2013 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014)
 
 #ifndef DUNE_XT_FUNCTIONS_BASE_VISUALIZATION_HH
diff --git a/dune/xt/functions/checkerboard.hh b/dune/xt/functions/checkerboard.hh
index 33618ef90..69f62ae89 100644
--- a/dune/xt/functions/checkerboard.hh
+++ b/dune/xt/functions/checkerboard.hh
@@ -8,7 +8,7 @@
 //   Andreas Buhr    (2014)
 //   Felix Schindler (2012 - 2018)
 //   René Fritze     (2013 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_HH
diff --git a/dune/xt/functions/constant.hh b/dune/xt/functions/constant.hh
index d3d1bcb02..2cc89a299 100644
--- a/dune/xt/functions/constant.hh
+++ b/dune/xt/functions/constant.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2013 - 2018)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2013 - 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_HH
diff --git a/dune/xt/functions/exceptions.hh b/dune/xt/functions/exceptions.hh
index 762451984..e54052129 100644
--- a/dune/xt/functions/exceptions.hh
+++ b/dune/xt/functions/exceptions.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2017 - 2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXCEPTIONS_HH
diff --git a/dune/xt/functions/expression.hh b/dune/xt/functions/expression.hh
index 495ed39a1..80944b122 100644
--- a/dune/xt/functions/expression.hh
+++ b/dune/xt/functions/expression.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2012 - 2017)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2012 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_HH
diff --git a/dune/xt/functions/expression/base.hh b/dune/xt/functions/expression/base.hh
index 1b9acaec3..c34889d4b 100644
--- a/dune/xt/functions/expression/base.hh
+++ b/dune/xt/functions/expression/base.hh
@@ -8,7 +8,7 @@
 //   Andreas Buhr    (2014)
 //   Felix Schindler (2013 - 2017)
 //   René Fritze     (2013, 2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_BASE_HH
diff --git a/dune/xt/functions/expression/default.hh b/dune/xt/functions/expression/default.hh
index f637ccb42..5e5e032b0 100644
--- a/dune/xt/functions/expression/default.hh
+++ b/dune/xt/functions/expression/default.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2012 - 2018)
 //   Kirsten Weber   (2013)
 //   René Fritze     (2012 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_DEFAULT_HH
diff --git a/dune/xt/functions/expression/mathexpr.cc b/dune/xt/functions/expression/mathexpr.cc
index 22187a983..54eff7c11 100644
--- a/dune/xt/functions/expression/mathexpr.cc
+++ b/dune/xt/functions/expression/mathexpr.cc
@@ -6,7 +6,7 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2012 - 2013, 2015 - 2016)
-//   René Fritze     (2012)
+//   René Fritze     (2012, 2018)
 
 /*
 
diff --git a/dune/xt/functions/expression/parametric.hh b/dune/xt/functions/expression/parametric.hh
index 83b4e02aa..5687705d4 100644
--- a/dune/xt/functions/expression/parametric.hh
+++ b/dune/xt/functions/expression/parametric.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PARAMETRIC_HH
diff --git a/dune/xt/functions/flattop.hh b/dune/xt/functions/flattop.hh
index 13c41f8b8..d5ffc276f 100644
--- a/dune/xt/functions/flattop.hh
+++ b/dune/xt/functions/flattop.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2014 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2015, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_FLATTOP_HH
diff --git a/dune/xt/functions/generic/function.hh b/dune/xt/functions/generic/function.hh
index e4d0949f8..ea053e0b4 100644
--- a/dune/xt/functions/generic/function.hh
+++ b/dune/xt/functions/generic/function.hh
@@ -8,7 +8,7 @@
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2013 - 2016, 2018)
 //   Sven Kaulmann   (2013)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014, 2017)
 
 #ifndef DUNE_XT_FUNCTIONS_GENRIC_FUNCTION_HH
diff --git a/dune/xt/functions/generic/grid-function.hh b/dune/xt/functions/generic/grid-function.hh
index 305b0b7de..57aeb53a2 100644
--- a/dune/xt/functions/generic/grid-function.hh
+++ b/dune/xt/functions/generic/grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_GENERIC_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/indicator.hh b/dune/xt/functions/indicator.hh
index 08f917665..4990693ac 100644
--- a/dune/xt/functions/indicator.hh
+++ b/dune/xt/functions/indicator.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2015 - 2018)
 //   René Fritze     (2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INDICATOR_HH
diff --git a/dune/xt/functions/interfaces/element-functions.hh b/dune/xt/functions/interfaces/element-functions.hh
index 0850eb54c..09682d609 100644
--- a/dune/xt/functions/interfaces/element-functions.hh
+++ b/dune/xt/functions/interfaces/element-functions.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_ELEMENT_FUNCTIONS_HH
diff --git a/dune/xt/functions/interfaces/function.hh b/dune/xt/functions/interfaces/function.hh
index 0cc4dc3ad..cba06a0cd 100644
--- a/dune/xt/functions/interfaces/function.hh
+++ b/dune/xt/functions/interfaces/function.hh
@@ -6,7 +6,8 @@
 //          with "runtime exception" (http://www.dune-project.org/license.html)
 // Authors:
 //   Felix Schindler (2017 - 2018)
-//   TiKeil          (2018)
+//   René Fritze     (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_FUNCTION_HH
 #define DUNE_XT_FUNCTIONS_INTERFACES_FUNCTION_HH
diff --git a/dune/xt/functions/interfaces/grid-function.hh b/dune/xt/functions/interfaces/grid-function.hh
index 1a07e074b..8679658c5 100644
--- a/dune/xt/functions/interfaces/grid-function.hh
+++ b/dune/xt/functions/interfaces/grid-function.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACES_GRID_FUNCTION_HH
diff --git a/dune/xt/functions/spe10/model1.hh b/dune/xt/functions/spe10/model1.hh
index 3af8b51be..04dd3014e 100644
--- a/dune/xt/functions/spe10/model1.hh
+++ b/dune/xt/functions/spe10/model1.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2013 - 2018)
 //   René Fritze     (2014 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2014, 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_MODEL1_HH
diff --git a/dune/xt/functions/spe10/model2.hh b/dune/xt/functions/spe10/model2.hh
index e856380bd..9315a6947 100644
--- a/dune/xt/functions/spe10/model2.hh
+++ b/dune/xt/functions/spe10/model2.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2015 - 2016, 2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017 - 2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_MODEL2_HH
diff --git a/dune/xt/functions/test/CMakeLists.txt b/dune/xt/functions/test/CMakeLists.txt
index 1d7fc3d01..66cc26528 100644
--- a/dune/xt/functions/test/CMakeLists.txt
+++ b/dune/xt/functions/test/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2016 - 2017)
 #   René Fritze     (2016 - 2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 #   Tobias Leibner  (2016, 2018)
 # ~~~
 
diff --git a/dune/xt/functions/test/ESV2007_cutoff_1d.py b/dune/xt/functions/test/ESV2007_cutoff_1d.py
index a0c297b60..1486554ee 100644
--- a/dune/xt/functions/test/ESV2007_cutoff_1d.py
+++ b/dune/xt/functions/test/ESV2007_cutoff_1d.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py b/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
index ce6e8ffe7..cee88c6e2 100644
--- a/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
+++ b/dune/xt/functions/test/ESV2007_cutoff_2d_3d.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_exact_solution.py b/dune/xt/functions/test/ESV2007_exact_solution.py
index db3bb1290..48689f905 100644
--- a/dune/xt/functions/test/ESV2007_exact_solution.py
+++ b/dune/xt/functions/test/ESV2007_exact_solution.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/ESV2007_force.py b/dune/xt/functions/test/ESV2007_force.py
index db3bb1290..48689f905 100644
--- a/dune/xt/functions/test/ESV2007_force.py
+++ b/dune/xt/functions/test/ESV2007_force.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/checkerboard.py b/dune/xt/functions/test/checkerboard.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/checkerboard.py
+++ b/dune/xt/functions/test/checkerboard.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/constant.py b/dune/xt/functions/test/constant.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/constant.py
+++ b/dune/xt/functions/test/constant.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/difference.py b/dune/xt/functions/test/difference.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/difference.py
+++ b/dune/xt/functions/test/difference.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/disabled_affine.cc b/dune/xt/functions/test/disabled_affine.cc
index 780fbfd35..d72942319 100644
--- a/dune/xt/functions/test/disabled_affine.cc
+++ b/dune/xt/functions/test/disabled_affine.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include <dune/xt/common/test/main.hxx>
 
diff --git a/dune/xt/functions/test/disabled_affine_flux.cc b/dune/xt/functions/test/disabled_affine_flux.cc
index 1ce316105..f60ef0e6d 100644
--- a/dune/xt/functions/test/disabled_affine_flux.cc
+++ b/dune/xt/functions/test/disabled_affine_flux.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include <dune/xt/common/test/main.hxx>
 
diff --git a/dune/xt/functions/test/disabled_lambda_global_flux_function.cc b/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
index f46984b5f..df433d3a0 100644
--- a/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
+++ b/dune/xt/functions/test/disabled_lambda_global_flux_function.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #include <dune/xt/common/test/main.hxx>
diff --git a/dune/xt/functions/test/disabled_lambda_local_flux_function.cc b/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
index 628a07222..27ad3be96 100644
--- a/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
+++ b/dune/xt/functions/test/disabled_lambda_local_flux_function.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #include <dune/xt/common/test/main.hxx>
diff --git a/dune/xt/functions/test/expression_matrix_valued.py b/dune/xt/functions/test/expression_matrix_valued.py
index 6210ea14e..85bb7b2a7 100644
--- a/dune/xt/functions/test/expression_matrix_valued.py
+++ b/dune/xt/functions/test/expression_matrix_valued.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/expression_parametric.py b/dune/xt/functions/test/expression_parametric.py
index 12ee46968..b551166a7 100644
--- a/dune/xt/functions/test/expression_parametric.py
+++ b/dune/xt/functions/test/expression_parametric.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/expression_vector_valued.py b/dune/xt/functions/test/expression_vector_valued.py
index 12ee46968..b551166a7 100644
--- a/dune/xt/functions/test/expression_vector_valued.py
+++ b/dune/xt/functions/test/expression_vector_valued.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/flattop.py b/dune/xt/functions/test/flattop.py
index c7d7793f1..be70a137f 100644
--- a/dune/xt/functions/test/flattop.py
+++ b/dune/xt/functions/test/flattop.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/grids.py b/dune/xt/functions/test/grids.py
index 35f937577..41c39f2fa 100644
--- a/dune/xt/functions/test/grids.py
+++ b/dune/xt/functions/test/grids.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import itertools
diff --git a/dune/xt/functions/test/lambda_function.py b/dune/xt/functions/test/lambda_function.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/lambda_function.py
+++ b/dune/xt/functions/test/lambda_function.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/lambda_grid_function.py b/dune/xt/functions/test/lambda_grid_function.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/lambda_grid_function.py
+++ b/dune/xt/functions/test/lambda_grid_function.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/product.py b/dune/xt/functions/test/product.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/product.py
+++ b/dune/xt/functions/test/product.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/spe10_model1.py b/dune/xt/functions/test/spe10_model1.py
index db3bb1290..48689f905 100644
--- a/dune/xt/functions/test/spe10_model1.py
+++ b/dune/xt/functions/test/spe10_model1.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/spe10_model2.py b/dune/xt/functions/test/spe10_model2.py
index 4c2fffa2e..1e5875aaa 100644
--- a/dune/xt/functions/test/spe10_model2.py
+++ b/dune/xt/functions/test/spe10_model2.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/sum_for_functions.py b/dune/xt/functions/test/sum_for_functions.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/sum_for_functions.py
+++ b/dune/xt/functions/test/sum_for_functions.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/test/sum_for_grid_functions.py b/dune/xt/functions/test/sum_for_grid_functions.py
index 1b898631a..96c274e37 100644
--- a/dune/xt/functions/test/sum_for_grid_functions.py
+++ b/dune/xt/functions/test/sum_for_grid_functions.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil (2018)
+#   René Fritze (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 import grids
diff --git a/dune/xt/functions/type_traits.hh b/dune/xt/functions/type_traits.hh
index 28e7c20c6..cdc32bce0 100644
--- a/dune/xt/functions/type_traits.hh
+++ b/dune/xt/functions/type_traits.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2017)
 
 #ifndef DUNE_XT_FUNCTIONS_TYPE_TRAITS_HH
diff --git a/python/dune/xt/CMakeLists.txt b/python/dune/xt/CMakeLists.txt
index 9322be0fa..a34e76383 100644
--- a/python/dune/xt/CMakeLists.txt
+++ b/python/dune/xt/CMakeLists.txt
@@ -7,7 +7,7 @@
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
 #   René Fritze (2018)
-#   TiKeil      (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 dune_pybindxi_add_module(_interfaces EXCLUDE_FROM_ALL interfaces.cc)
diff --git a/python/dune/xt/bindings.cc b/python/dune/xt/bindings.cc
index 50f8e4014..9b72f83c9 100644
--- a/python/dune/xt/bindings.cc
+++ b/python/dune/xt/bindings.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include "config.h"
 
diff --git a/python/dune/xt/functions/ESV2007.bindings.hh b/python/dune/xt/functions/ESV2007.bindings.hh
index e9f05baa2..2ec038c6d 100644
--- a/python/dune/xt/functions/ESV2007.bindings.hh
+++ b/python/dune/xt/functions/ESV2007.bindings.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
 #define DUNE_XT_FUNCTIONS_ESV2007_BINDINGS_HH
diff --git a/python/dune/xt/functions/__init__.py b/python/dune/xt/functions/__init__.py
index abf7fd807..7ee5fc3f5 100644
--- a/python/dune/xt/functions/__init__.py
+++ b/python/dune/xt/functions/__init__.py
@@ -8,7 +8,7 @@
 # Authors:
 #   Felix Schindler (2017)
 #   René Fritze     (2018)
-#   TiKeil          (2018)
+#   Tim Keil        (2018)
 # ~~~
 
 import dune.xt
diff --git a/python/dune/xt/functions/checkerboard.hh b/python/dune/xt/functions/checkerboard.hh
index 81fd26ab9..9c4cbb9af 100644
--- a/python/dune/xt/functions/checkerboard.hh
+++ b/python/dune/xt/functions/checkerboard.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_CHECKERBOARD_PBH
diff --git a/python/dune/xt/functions/constant.hh b/python/dune/xt/functions/constant.hh
index 4fceb347a..fdc1e7854 100644
--- a/python/dune/xt/functions/constant.hh
+++ b/python/dune/xt/functions/constant.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_CONSTANT_PBH
 #define DUNE_XT_FUNCTIONS_CONSTANT_PBH
diff --git a/python/dune/xt/functions/expression.hh b/python/dune/xt/functions/expression.hh
index 0e5958815..527ac8ae6 100644
--- a/python/dune/xt/functions/expression.hh
+++ b/python/dune/xt/functions/expression.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_EXPRESSION_PBH
 #define DUNE_XT_FUNCTIONS_EXPRESSION_PBH
diff --git a/python/dune/xt/functions/indicator.hh b/python/dune/xt/functions/indicator.hh
index c696a3303..a3b7f3cb0 100644
--- a/python/dune/xt/functions/indicator.hh
+++ b/python/dune/xt/functions/indicator.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #ifndef PYTHON_DUNE_XT_FUNCTIONS_INDICATOR_HH
 #define PYTHON_DUNE_XT_FUNCTIONS_INDICATOR_HH
diff --git a/python/dune/xt/functions/interfaces.hh b/python/dune/xt/functions/interfaces.hh
index 350ac1b19..c7cf65e73 100644
--- a/python/dune/xt/functions/interfaces.hh
+++ b/python/dune/xt/functions/interfaces.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2018)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_INTERFACE_PBH
diff --git a/python/dune/xt/functions/spe10.hh b/python/dune/xt/functions/spe10.hh
index 67c7222bf..c1eb7703b 100644
--- a/python/dune/xt/functions/spe10.hh
+++ b/python/dune/xt/functions/spe10.hh
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 //   Tobias Leibner  (2018)
 
 #ifndef DUNE_XT_FUNCTIONS_SPE10_PBH
diff --git a/python/dune/xt/interfaces.cc b/python/dune/xt/interfaces.cc
index aab659ac0..3cb48aaf5 100644
--- a/python/dune/xt/interfaces.cc
+++ b/python/dune/xt/interfaces.cc
@@ -7,7 +7,7 @@
 // Authors:
 //   Felix Schindler (2016 - 2017)
 //   René Fritze     (2018)
-//   TiKeil          (2018)
+//   Tim Keil        (2018)
 
 #include "config.h"
 
diff --git a/python/setup.cfg b/python/setup.cfg
index 9f063e695..447a70555 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -7,7 +7,7 @@
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
 #   Rene Fritze (2018)
-#   TiKeil      (2018)
+#   Tim Keil    (2018)
 # ~~~
 
 [aliases]
diff --git a/python/test/constant.py b/python/test/constant.py
index cfa82bae7..e9f0ad80d 100644
--- a/python/test/constant.py
+++ b/python/test/constant.py
@@ -6,7 +6,8 @@
 #      or  GPL-2.0+ (http://opensource.org/licenses/gpl-license)
 #          with "runtime exception" (http://www.dune-project.org/license.html)
 # Authors:
-#   TiKeil         (2018)
+#   René Fritze    (2018)
+#   Tim Keil       (2018)
 #   Tobias Leibner (2018)
 # ~~~
 
-- 
GitLab