diff --git a/.gitattributes b/.gitattributes
index b3de23e58de..51a00f80385 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -60,6 +60,9 @@ Core/Code/CppMicroServices/**/*.h     copyright=apache-license
 
 # There is no need to check files in the utilities directory for copyright
 Utilities/**    -copyright
+Applications/PluginGenerator/PluginTemplate/src/**/*.h -copyright
+Applications/PluginGenerator/PluginTemplate/src/**/*.cpp -copyright
+Applications/PluginGenerator/ProjectTemplate/Apps/TemplateApp/TemplateApp.cpp -copyright
 
 # ExternalData content links must have LF newlines
 *.md5            crlf=input
diff --git a/Applications/PluginGenerator/LICENSE.txt b/Applications/PluginGenerator/LICENSE.txt
index 8761edc2467..07c13ca8431 100644
--- a/Applications/PluginGenerator/LICENSE.txt
+++ b/Applications/PluginGenerator/LICENSE.txt
@@ -12,18 +12,18 @@ modification, are permitted provided that the following conditions are met:
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
 
- * Neither the name of the German Cancer Research Center, nor the names of 
-   its contributors may be used to endorse or promote products derived from 
+ * Neither the name of the German Cancer Research Center, nor the names of
+   its contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
diff --git a/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox b/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
index c254a2ba836..56feaaae055 100755
--- a/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
+++ b/Applications/PluginGenerator/PluginTemplate/documentation/UserManual/Manual.dox
@@ -16,4 +16,3 @@ Describe the features of your awesome plugin here
 </ul>
 
 */
-
diff --git a/Applications/PluginGenerator/PluginTemplate/documentation/doxygen/modules.dox b/Applications/PluginGenerator/PluginTemplate/documentation/doxygen/modules.dox
index 4a1244f9a8e..9dcb60e028f 100644
--- a/Applications/PluginGenerator/PluginTemplate/documentation/doxygen/modules.dox
+++ b/Applications/PluginGenerator/PluginTemplate/documentation/doxygen/modules.dox
@@ -3,7 +3,7 @@
   \ingroup MITKPlugins
 
   \brief Describe your plugin here.
-  
+
 */
 
 /**
diff --git a/Applications/PluginGenerator/PluginTemplate/files.cmake b/Applications/PluginGenerator/PluginTemplate/files.cmake
index ad0fe7df61e..c1b3369574a 100644
--- a/Applications/PluginGenerator/PluginTemplate/files.cmake
+++ b/Applications/PluginGenerator/PluginTemplate/files.cmake
@@ -40,4 +40,3 @@ endforeach(file ${SRC_CPP_FILES})
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
-
diff --git a/Applications/PluginGenerator/PluginTemplate/plugin.xml b/Applications/PluginGenerator/PluginTemplate/plugin.xml
index 51215b975c7..edacef0b6f9 100644
--- a/Applications/PluginGenerator/PluginTemplate/plugin.xml
+++ b/Applications/PluginGenerator/PluginTemplate/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
-  
+
   <extension point="org.blueberry.ui.views">
     <view id="$(view-id)"
           name="$(view-name)"
diff --git a/Applications/PluginGenerator/PluginTemplate/src/internal/QmitkTemplateView.h b/Applications/PluginGenerator/PluginTemplate/src/internal/QmitkTemplateView.h
index 40ffd7bac82..73d8c90fdef 100644
--- a/Applications/PluginGenerator/PluginTemplate/src/internal/QmitkTemplateView.h
+++ b/Applications/PluginGenerator/PluginTemplate/src/internal/QmitkTemplateView.h
@@ -10,12 +10,12 @@
 #include "ui_$(view-file-name)Controls.h"
 
 
-/*!
+/**
   \brief $(view-class-name)
 
   \warning  This class is not yet documented. Use "git blame" and ask the author to provide basic documentation.
 
-  \sa QmitkFunctionality
+  \sa QmitkAbstractView
   \ingroup ${plugin_target}_internal
 */
 class $(view-class-name) : public QmitkAbstractView
@@ -28,8 +28,6 @@ class $(view-class-name) : public QmitkAbstractView
 
     static const std::string VIEW_ID;
 
-    virtual void CreateQtPartControl(QWidget *parent);
-
   protected slots:
 
     /// \brief Called when the user clicks the GUI button
@@ -37,6 +35,8 @@ class $(view-class-name) : public QmitkAbstractView
 
   protected:
 
+    virtual void CreateQtPartControl(QWidget *parent);
+
     virtual void SetFocus();
 
     /// \brief called by QmitkFunctionality when DataManager's selection has changed
@@ -48,4 +48,3 @@ class $(view-class-name) : public QmitkAbstractView
 };
 
 #endif // $(view-file-name)_h
-