diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdd1c128a2798921c05617022273a121d680ee42..54e3d8849f8b9a9282cc86b1bcfeee8ed32aa6cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,4 +53,4 @@ deploy:
   - "echo $S3_CONFIG > $HOME/.s3cfg"
   - "export VERSION=$(ls *.apk)"
   - "s3cmd put $VERSION s3://releases/quasseldroid-ng/$VERSION"
-  - "s3cmd cp s3://releases/quasseldroid-ng/$VERSION s3://releases/quasseldroid-ng/QuasselDroidNG-latest.apk"
+  - "s3cmd cp s3://releases/quasseldroid-ng/$VERSION s3://releases/quasseldroid-ng/Quasseldroid-latest.apk"
diff --git a/README.md b/README.md
index b7931eee3644c07b6ae67cfafbebae95f107490a..ac716adf61eb2f861ee17851692529ed7712ae20 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,16 @@
-# QuasselDroid-ng
+#[Quasseldroid](https://quasseldroid.info/)
 
-[![Release Version](https://img.shields.io/github/release/justjanne/QuasselDroid-ng/all.svg)](https://github.com/justjanne/QuasselDroid-ng/releases)
+[![Release Version](https://img.shields.io/github/release/justjanne/quasseldroid-ng/all.svg)](https://github.com/justjanne/Quasseldroid-ng/releases)
 
 Quassel is a distributed, decentralized IRC client, written using C++ and Qt.
-QuasselDroid is a pure-java client for the Quassel core, allowing you to connect
-to your Quassel core using your Android ™ phone.
+Quasseldroid is a pure-java client for the Quassel core, allowing you to connect
+to your Quassel core using your Android™ phone.
 
-*Inspired by and based on [QuasselDroid](https://github.com/sandsmark/QuasselDroid)*
-
-![Screenshot of QuasselDroid on Phone and Tablet](https://i.k8r.eu/4V7PhQ)
+![Screenshot of Quasseldroid on Phone and Tablet](https://i.k8r.eu/4V7PhQ)
 
 ## Build Requirements
 
-QuasselDroid requires you to have the latest version of gradle installed, and
+Quasseldroid requires you to have the latest version of gradle installed, and
 a recent version of the Android SDK installed (and configured via the
 environment variable ANDROID_HOME)
 
@@ -36,7 +34,15 @@ keyPassword=passwordofyourkeyhere
 
 ## Authors
 
-*(in chronological order of appearance)*
+* **Janne Koschinski** (justJanne)
+  Rewrite, UI, Annotation Processors, Backend
+  
+## Acknowledgements
+
+This project was inspired by and is based on [Quasseldroid](https://github.com/sandsmark/quasseldroid)
+as well as [Quassel](https://quassel-irc.org/).
+
+Authors of the previous version of Quasseldroid:
 
 * **Frederik M. J. Vestre** (freqmod)
   Initial qdatastream deserialization attempts
@@ -46,25 +52,10 @@ keyPassword=passwordofyourkeyhere
   Legacy UI
 * **Ken Børge Viktil** (Kenji)
   Legacy UI
-* **Janne Koschinski** (justJanne)
-  Rewrite, UI, Annotation Processors, Backend
-
-## History
-
-The project was originally started by freqmod in December 2010 as a simple PoC, and then expanded by
-magnuf, sandsmark and Kenji until late 2014 into a usable Android app. At that time justJanne
-started a first fork to introduce Holo design, then rebased that fork and turned it into a pull
-request. Later finding more and more missing features, and more and more bugs, justJanne ended up
-rewrite large parts of the code, and became the sole maintainer in late 2015.
-
-This is a rewrite of that version, with focus on better performance, higher code quality, and
-better UI.
-
-The older implementation is still available at <https://github.com/sandsmark/QuasselDroid>.
 
 ## Used Libraries
 
-### QuasselDroid
+### Quasseldroid
 
 * [**Android Architecture Components: Lifecycle**](https://android.googlesource.com/platform/frameworks/support/+/master/lifecycle)
   Apache-2.0
@@ -132,9 +123,8 @@ The older implementation is still available at <https://github.com/sandsmark/Qua
 ## License
 
 > This program is free software: you can redistribute it and/or modify it
-> under the terms of the GNU General Public License as published by the Free
-> Software Foundation, either version 3 of the License, or (at your option)
-> any later version.
+> under the terms of the GNU General Public License version 3 as published
+> by the Free Software Foundation.
 
 > This program is distributed in the hope that it will be useful,
 > but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8461fb730dcc6a54ab9f288dbcd58d32f2bd3bcf..7766e5d8dee954d93cf86d4e0167460b3d1127b6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -69,7 +88,7 @@ android {
 
     vectorDrawables.useSupportLibrary = true
 
-    setProperty("archivesBaseName", "QuasselDroidNG-$versionName")
+    setProperty("archivesBaseName", "Quasseldroid-$versionName")
 
     multiDexEnabled = false
 
diff --git a/app/sampledata/messages.json b/app/sampledata/messages.json
index f11e6a9bde23ea634c93dc0acc5512916fe517ea..b2a72e5334e9dde756ef9c3feb2c1bc05bc51ec8 100644
--- a/app/sampledata/messages.json
+++ b/app/sampledata/messages.json
@@ -5,9 +5,9 @@
         {
           "id": 35465155,
           "time": "02:51",
-          "message": "justJanne: https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-197-g8f556b6-release.apk",
+          "message": "justJanne: https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-197-g8f556b6-release.apk",
           "sender": "justJanne",
-          "content": "https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-197-g8f556b6-release.apk"
+          "content": "https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-197-g8f556b6-release.apk"
         },
         {
           "id": 35465242,
@@ -257,9 +257,9 @@
         {
           "id": 35468622,
           "time": "04:25",
-          "message": "justJanne: New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-199-gac691ac-release.apk",
+          "message": "justJanne: New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-199-gac691ac-release.apk",
           "sender": "justJanne",
-          "content": "New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-199-gac691ac-release.apk"
+          "content": "New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-199-gac691ac-release.apk"
         },
         {
           "id": 35468623,
@@ -355,4 +355,4 @@
       ]
     ]
   ]
-}
\ No newline at end of file
+}
diff --git a/app/sampledata/recent_messages.json b/app/sampledata/recent_messages.json
index 3a8676dc431c150408de0299cf58bbfe270d81c8..c2534df0b84bbf9b59e3c1749ae511dc286e2c78 100644
--- a/app/sampledata/recent_messages.json
+++ b/app/sampledata/recent_messages.json
@@ -29,7 +29,7 @@
       {
         "id": 35468622,
         "time": "04:25",
-        "message": "New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-199-gac691ac-release.apk"
+        "message": "New version! https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-199-gac691ac-release.apk"
       },
       {
         "id": 35467158,
@@ -64,7 +64,7 @@
       {
         "id": 35465155,
         "time": "02:51",
-        "message": "https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-197-g8f556b6-release.apk"
+        "message": "https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-197-g8f556b6-release.apk"
       },
       {
         "id": 35465130,
@@ -99,8 +99,8 @@
       {
         "id": 35464606,
         "time": "02:39",
-        "message": "Exterminador: https://s3.kuschku.de/releases/quasseldroid-ng/QuasselDroidNG-v0.3.0-194-g08dc2bf-release.apk"
+        "message": "Exterminador: https://s3.kuschku.de/releases/quasseldroid-ng/QuasseldroidNG-v0.3.0-194-g08dc2bf-release.apk"
       }
     ]
   ]
-}
\ No newline at end of file
+}
diff --git a/app/src/debug/res/values-de/strings.xml b/app/src/debug/res/values-de/strings.xml
index 48c72cfed3b61c7ebece9f9bb734ad4d03523c6c..304bffbcf6cab271db41da2b777eaea9d890ba06 100644
--- a/app/src/debug/res/values-de/strings.xml
+++ b/app/src/debug/res/values-de/strings.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
index 36a756b030c3d28529ac52faea13883f97745e4d..cefbe7e8a89188201332173f818cf5ab53d6b442 100644
--- a/app/src/debug/res/values/colors.xml
+++ b/app/src/debug/res/values/colors.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index c680e26c3567d7a5ca44c4afdee4e038c21a1fef..5cf23d6e718545003106b1500977eee1be4f18ff 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96b3a7d1c4c7ed0afbb020699f485525dafadd32..a99e8e2d57397fbc4097186fa21684c4801edee3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -36,7 +36,7 @@
     android:required="false" />
 
   <application
-    android:name=".QuasselDroid"
+    android:name=".Quasseldroid"
     android:allowBackup="true"
     android:fullBackupContent="@xml/backup_content"
     android:description="@string/app_description"
diff --git a/app/src/main/java/de/kuschku/quasseldroid/Keys.kt b/app/src/main/java/de/kuschku/quasseldroid/Keys.kt
index 8af787c49eb6997c32d0387688de85807c67fee3..d3949bc2c31e929cbbe8206ccbdcd169ad5afa41 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/Keys.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/Keys.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/QuasselDroid.kt b/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
similarity index 94%
rename from app/src/main/java/de/kuschku/quasseldroid/QuasselDroid.kt
rename to app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
index cab9b28b8be9d6f5afc2daad41de71c102f8eb85..04d1279727ae8b650eab68194a1cff099b4ad8a0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/QuasselDroid.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/Quasseldroid.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,8 +35,8 @@ import de.kuschku.quasseldroid.util.compatibility.AndroidCompatibilityUtils
 import de.kuschku.quasseldroid.util.compatibility.AndroidLoggingHandler
 import de.kuschku.quasseldroid.util.compatibility.AndroidStreamChannelFactory
 
-class QuasselDroid : DaggerApplication() {
-  override fun applicationInjector(): AndroidInjector<out QuasselDroid> =
+class Quasseldroid : DaggerApplication() {
+  override fun applicationInjector(): AndroidInjector<out Quasseldroid> =
     DaggerAppComponent.builder().create(this)
 
   override fun onCreate() {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidGlideModule.kt b/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidGlideModule.kt
index d0fd0d5fc2dd98ccb2e8afdf9cc9e8160edd3933..8a94ddd37ebe2cec0fb1db06a91d4b7c76da2749 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidGlideModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/QuasseldroidGlideModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityBaseModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityBaseModule.kt
index 44e5bbead722e1c15cab6cdf3c10709312349d18..d09b8a6eb757c53c4158cd8542af11f34d81cbcf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityBaseModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityBaseModule.kt
@@ -1,3 +1,25 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 Ken Børge Viktil
+ * Copyright (c) 2018 Magnus Fjell
+ * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package de.kuschku.quasseldroid.dagger
 
 import android.arch.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
index 9b59628b8da091e5a42e73118fc5d6e51e65722d..7e13ec17a62d82480335fc7c1e896c616edef4fb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityScope.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityScope.kt
index 24db7f32638518b4c3906ab4ca7a9517e6c8578f..04b4567f712efc54b5bbc0680696c1d60d20fa8a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityScope.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityScope.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/AppComponent.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/AppComponent.kt
index 7b50b8e2e0a80c0e8f2b53cd693b1edd3093b1ce..bcbe594c74900a01dedfd9945fc41c93d7ce6535 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/AppComponent.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/AppComponent.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,7 +25,7 @@ package de.kuschku.quasseldroid.dagger
 import dagger.Component
 import dagger.android.AndroidInjector
 import dagger.android.support.AndroidSupportInjectionModule
-import de.kuschku.quasseldroid.QuasselDroid
+import de.kuschku.quasseldroid.Quasseldroid
 import javax.inject.Singleton
 
 @Singleton
@@ -36,7 +36,7 @@ import javax.inject.Singleton
     ActivityModule::class
   ]
 )
-interface AppComponent : AndroidInjector<QuasselDroid> {
+interface AppComponent : AndroidInjector<Quasseldroid> {
   @Component.Builder
-  abstract class Builder : AndroidInjector.Builder<QuasselDroid>()
+  abstract class Builder : AndroidInjector.Builder<Quasseldroid>()
 }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/AppModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/AppModule.kt
index b5f18429958c2892463ec12ab00bd5af1760d6d9..aa2f99f3cf2b7a5123fd3610873740e73cc06d3b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/AppModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/AppModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,9 +25,4 @@ package de.kuschku.quasseldroid.dagger
 import dagger.Module
 
 @Module
-abstract class AppModule {
-  /*
-  @Binds
-  abstract fun provideContext(application: QuasselDroid): Context
-  */
-}
+abstract class AppModule
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/DatabaseModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/DatabaseModule.kt
index b3092d1d336e4996275b7818814b27d3ef87e4b8..95cee0705c9758e5359c8234e1e2eb1c9c39b03b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/DatabaseModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/DatabaseModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/SettingsModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/SettingsModule.kt
index f9d0d3192fa2409899adfcdb1dcde92763fd3c47..74caf21aa15bc0ca6bd6036f622834a650c39b9c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/SettingsModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/SettingsModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/AsyncBackend.kt b/app/src/main/java/de/kuschku/quasseldroid/service/AsyncBackend.kt
index 7d6d6fcb8a50e054067cf1efaec49074e4d39e44..8d9f8e77417baa958b31775f4c68533e88d468c4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/AsyncBackend.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/AsyncBackend.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselBinder.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselBinder.kt
index 9ec34fd9f58986f757d881691dc69cbf7ae52ed6..7d6fc189dd8f2ebb5ad88c9f23070cbfb71c65db 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselBinder.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselBinder.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
index d577ee1ec10a7bf8c12f92fd85435ce86fb4820c..9143fa3bf9839b02964401eaf988a2baa0fde87f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselServiceModule.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselServiceModule.kt
index 8b1b81515a4e8e639d5b802feff353700877f04d..ba91d912dc7ce2cb8d9ee8eadf91d2c9795ab012 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselServiceModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselServiceModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
index 627067ba0f197cd85ab996d593fb4b3f236a23e1..fb90421862bca216be8892e26363f120d2a529d6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/AppearanceSettings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/AutoCompleteSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/AutoCompleteSettings.kt
index 16c24fa1d781eff2357b0c53579a9420e2b1288e..c44556e34a9a6ce410e805669e3c245a36f18660 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/AutoCompleteSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/AutoCompleteSettings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
index eaab294a303c9acf8a1023beba9dd36d6e52217a..55c23e193761d0c3b7ab4b33e232bb698c16167a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/BacklogSettings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
index 5c9dbdb7fa2124e1c8906ea929bea08d57e044a5..4b0aebce92bf042e0e5d7bdcc6051c6916a242de 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/ConnectionSettings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/MessageSettings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/MessageSettings.kt
index 55db750e2c4d5f8329337060a2c0e4ffa42798ae..17963df062320ba0f5efe6b8505f4d43089a7f76 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/MessageSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/MessageSettings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
index 6b22cab55317d6361c5d43814c07aea89dd78e2f..5196c970d4fe149b307757050c44033dba1d0fa7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/settings/Settings.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
index 7e29ab877ba26d74b547ee281c73340f4ee84354..311b3b6ed818a4c514026429392faeb5502618c7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/BrowserCompatibleHostnameVerifier.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselHostnameVerifier.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselHostnameVerifier.kt
index 1a4a89b4293d1ccff33b9c154cf97d8a58583cd3..87c996132c137c184e033a3e7eda0ebbee703422 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselHostnameVerifier.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselHostnameVerifier.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselTrustManager.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselTrustManager.kt
index d56c90246e6080dbd9471464182f57e02aa03f15..3276a043888538e953b0dde3c49734ccf6533158 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselTrustManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/QuasselTrustManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselCertificateManager.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselCertificateManager.kt
index f41fd13c88f8d9091573ddc30fc6595128d0cf9d..782bc3ed1f92417ed33be798ff50a7a72ce0e0aa 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselCertificateManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselCertificateManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselHostnameManager.kt b/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselHostnameManager.kt
index d9819d0a2c8623bf5bac4614f84ad65c97666549..fe651c994f073bfbb15b48d15df7a83ac0d3fd66 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselHostnameManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ssl/custom/QuasselHostnameManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
index 0bff8c75878c445a1d7fcd7c896bd651f24ea728..f3454def71f8b486441c273df2586d60a94bda13 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivityModule.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivityModule.kt
index 58f3821056c88d37a0c60cb832d2d17e5228d9d7..5465abd41eccf13ecefecdc851fa6390e9282ff1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivityModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivityModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatFragmentProvider.kt
index ce591728a52bef0c556640269f563631fd6bd2a0..7068272290a3ba462581d3b8267ed819102854e9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
index 6988383a13425916f054b83dd12e49b5e289b9b5..3c06f73e12dc3c32cf261ac6484de55254496743 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/ToolbarFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
index aad01600cba0978a0f610f15396c491103a1d6fc..87c088ea7d2f3091998ce2f1fb5ec6af4e2d0df7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferListAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
index 24e507588eb91b6ebcfbb184a0ccddeccb61c718..2540dde99990d9e7f3288906ed41a6674c7496b0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index 4de5b6e3a63d42e438e84d026e7f63e63199f3da..97dc4f6da63fa7e77ab1b92e31c94c3f85fa4878 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoActivity.kt
index fec59b6f69ed08e9f5afbdf68efdfc938e9e424b..e1c91fdc486a3e5a3afe0888f66d5c4c416b3012 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt
index 5c43a3e762b5f386c41dea566cba23eb44536954..027161385ba2ebb6a236570b34ee180eba1f9eae 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragmentProvider.kt
index 876d1c6b6e96007f94e26c811dfdd47fe026d86c..8c9610ce4700ed877063268a56827a395b91ae93 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/channel/ChannelInfoFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoActivity.kt
index 078c5a111e0ace5f23eba5c58cb4486e52ddeab0..e7fe19166ed2e787bfb3b362a45f76ec43de1a30 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
index f5c0f9906cb27b3365d38479e99c66fdfc76030d..fff72805b84b7dabb48480e970895729af8ccab6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragmentProvider.kt
index 225171f124ed5f833da1020cbdf989c6f2a3befc..6c4d3c8028b061ec549dfc09b0ece3ae70b9f020 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/info/user/UserInfoFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
index ce80c2ccf80e3d0ef0c05b04af3d3575f69b8490..50a9b7b3b613169ac0cd49cc6abae9e3420fb170 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
index 2f5a0957c7cfd0cc6cdd96d29754ac5ad77979a7..e30f51a4c05bc5cd86eb931be5c17d91bb4554b5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompletionState.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompletionState.kt
index d5d1bde5b1272dfa471520e8ec5d56146893745f..b377189de962e9345988fc8cdc0e2ef67f35a787 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompletionState.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompletionState.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
index 9e2eaae8c9e8f25fd6ef22749cd3e2888792b548..c1c2edd08904f24af9a077015e7242faa3a5e6c2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/ChatlineFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
index d86dbfb58df43c45ae2d31cf53c367fb4f31a8ec..f7c8e3aee31e883178b747441015b7476fce8020 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/EditorHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
index d66ae79d7c0b29cd436b58355f35ac6dfacd2c64..7ae7df42f1ed16a37df04f410cfa7389f935e074 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/MessageHistoryAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
index 32c2896095593dcef71aff0e8259472069b5370e..4f6cb65691b636bf96119f4ca651391b4bfdb614 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichEditText.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichToolbar.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichToolbar.kt
index d6c5d32552b22921b5b9b4fb0c19415b66ae1a8a..498227722d13a101487b35795d65168f0fa407a8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichToolbar.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/RichToolbar.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DayChangeItemDecoration.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DayChangeItemDecoration.kt
index 9077e564bd6de7eb31351a0ad65a631f64175158..1ceecb9912a84c18ee9bb31fea17331847d845b6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DayChangeItemDecoration.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DayChangeItemDecoration.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
index c4bb9ca9820c7c1d27134883b292d68b62d0bb94..82ecdbd852c728d03d8a58fe3c2e3b3cd0a92702 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MarkerLineItemDecoration.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MarkerLineItemDecoration.kt
index f8d545de9014d22a6aa85d844e9923388ff0e186..f15655e8178fe32d785ec2c739707f8ea5921521 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MarkerLineItemDecoration.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MarkerLineItemDecoration.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
index f8df83300409a5f6d93e6ca20fb633b3f253e21d..a1b33bdb48b678ba7be2f23ab0a42aab123d9dc8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index caf7109c3fef108759571955932e0576ef6df04e..d32b5ec04a04645bf5cee8b37b5d18c19c2b7758 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
index c82c5d0d274bb5e390d1521a665d94e9889955a2..5c04e7070163bc2991d9ca4ec9d6317c64484513 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageRenderer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 4d0bfe59888ed5b203b1a9fd379c0fdf6bcec2d0..6e749e16fdb5cf24917f2d2de103437592108cbd 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
index 2fb73b1ceb8cb63990775ba4988b252ab33d2c89..00fda74faedbbbb439bb14e44b0b5338e3609589 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
index 1fdbbf45452ce2533be666b6732259c7067acf73..94e003adde9b6b6ddf1b857b3a5310b6ca3e1765 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/nicks/NickListFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicActivity.kt
index dd902839de26120fe552ba6d95fb42a1b6c85854..9a2fa8cddd7168ffae4c6a9e8c685d00dc1204f5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
index 152acefcc2fbe8f54f376da03d18c93606287be2..2b3b306f7c456e6b6d6bcc396f398c87cb66d8d5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragmentProvider.kt
index 45d32d9ebf96aec401db8de95c2d40840587212d..01dbcaf16ba85863792545ea0c6b05a1e59d227a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/topic/TopicFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutActivity.kt
index 9601533451c2f3c5b8fea2b088917f16bc3159dd..802d4a768eac5bd682eb7244aee3b9a6ce6b80cb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
index bdfa52c1b8ec9f593606517cade6da37e7cab9a0..e5e8d6cf8dead1a8d80f5278221902f1bee79f44 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragmentProvider.kt
index 40f529ceddffbc0258e9b19abd7d4dddafc04852..e13ebce0d59f60f3fdc58c7b8d9733590dbbb29c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/AboutFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Contributor.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Contributor.kt
index b635ad2e2a940a5c190d6a968346c56d155af126..7a8236e6fde04d52f9645e223b39dc5227d08fc2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Contributor.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Contributor.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/ContributorAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/ContributorAdapter.kt
index b686d8ab05b19ba0196a74c20b54a09ce3ec89b1..b2ad79911f8a537905e042dda1365bcbbd9b4c1d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/ContributorAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/ContributorAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Library.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Library.kt
index b8e3f22170b3b308d22faa06f4fdb315123b2644..9b2a43c6fb62e14fed8882250a284632322d8416 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Library.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/Library.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/LibraryAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/LibraryAdapter.kt
index 38ac549b1e4388ed5273e5e96b8f248ccdf28002..86e253179ecdda9fca04a95180ee28684144062b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/LibraryAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/LibraryAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/License.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/License.kt
index cbf97f50b942f7396405b2647464ce47f7833bd8..e4234670df70a53871d1462438d33d4e601cddb0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/License.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/about/License.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsActivity.kt
index 04c6d77fa2e75b7db6187e030dd3b4634bb8c035..5552b31e28c01989b7780005727ab053303a82a0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
index 5aff5078c46efa65fde76163661db4a974ebb5a8..d21894df9fe41280a8463217d9f2994fcef11918 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragmentProvider.kt
index 304b22e6223e49278d427e6d4550ccd341cb218d..acf2713d042186369dec6e804bbcd301c5ea0a5c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/client/ClientSettingsFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashActivity.kt
index 2715ce694abb2ae499acf97a92e2797ec3c0b31e..125f0c6c8e69e6ea59794d8f1950580f09d4de55 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashAdapter.kt
index ca3582ff84a73a939027bcfacb3ee68982291074..a40724e39dd9d4b6c9ad9e94235e3b3f34c32d6a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragment.kt
index 655474843e87ea711fc74277331eaf577be382c5..a5668042e8dbff434861c6e2efa1a0028d70a6ab 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragmentProvider.kt
index 3be00ebb5bf950c338a2a43b10673be3c248a503..be04f8334b0483eb1d8ebe05a7f140e5d154f4a5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/crash/CrashFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseActivity.kt
index ff4823b46ff1904846c877b27f0f1f2c9ee7882f..9b02a6019565d7501a7b151d7f157a3360cfd80a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragment.kt
index 9994b38390d779b13214486dae854d321ef3ba93..292ed0a9f870f018a64d1359f200fc0a405c7eec 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragmentProvider.kt
index 14758b222cde8c6b533005e4d6f08fdf8272dc6d..201b9da11a2d1a21c3526514c06161993bbdac83 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/license/LicenseFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/Whitelist.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/Whitelist.kt
index 667e615c8195ccd8adb5a299a755866bcf5138f1..ab4e7d6c50845bd235233225011f730e13e0c6ec 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/Whitelist.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/Whitelist.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistActivity.kt
index f25f4afc7b3b41a87d376652bd0e33e67b7eab43..b24715a9558e81c505181ab67983d8274fed23be 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistCertificateAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistCertificateAdapter.kt
index 95f92825dd9bef0cff46c35d1d88a4f88fe6dfcf..d5a98c158e6f8e01df3cd6b2bf6d574d64b29679 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistCertificateAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistCertificateAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
index d30de8543afe29f25bfa97081da013955a650a7c..0fd38fd7ac3fb5eb13094f4a1afb304d4be5dcbc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragmentProvider.kt
index ef07f186ff23d075f2159261fc1d8118c3643af3..e8608951fa5941e2510a29d2e137668b7f6a763c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistHostnameAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistHostnameAdapter.kt
index 2b8eeb42f0f67f60f4bc5b02718bd2c2dc3fcabf..e18bb1ef6cb87a68fc8541c75895da69d62269d6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistHostnameAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/clientsettings/whitelist/WhitelistHostnameAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsActivity.kt
index bb70dad773b0b55f6ac10bb0a4f37e3755e748da..81a246ba3854fafc9435ba93d71a8c117fdf287c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
index a82961d79a07de8723ca4e8e967dc855bda66fd2..eb16f2ec697c4654b7182c8d9b6b955e0bdca58d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
index 09bd1f71985335b0ce0b8366c3705ab8ef0246e9..8f241da49c1b4813e8a71ccf4da32b257ccc5db7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsFragment.kt
index cab0589f0ed4035f28d124dada35a68b9c859dcd..6709b2fbf799f0c77bc300a49776cd407ed787f9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItem.kt
index 672e13e600d0f717e3fe3a9b83a7d22f86532383..c35a53eb961d30f08dae0c144d6de712d12e4ac3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItemAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItemAdapter.kt
index 7b4cd18e4c7ee283c0e9fa35a24ace0f3b228bd1..88c2539305c0c716447b99e861e7c466dfeffcdc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItemAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/SettingsItemAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemActivity.kt
index 5228c4b09f51df4453ababc0e0f10cd056ca0a93..4292948bbb554670587b031fccde9f6965b6a5af 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
index 22b6499cd2330e5220cfb2c47ab0b7e07014dd3a..146b41fde8c26073c949598908a80204a6717f77 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragmentProvider.kt
index c9c882f045a6abf40d97122aaa5c830c7e8bc2a5..c8c38b34ea183eb79e6ce6671c4dad181ee1cc27 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListActivity.kt
index f8994adb39c0f3192515d18a55321a7962cd4353..7c7f6f1beab25b973b27f81eef049f87fe9ac943 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListAdapter.kt
index 9b9f7b509ed625c9db49df644c96903ee4711fe8..7f89823cb0f09d753a99f04d6f015af0b7e68829 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
index 0dfb4662624b53e3c2f896bf70a63c5db99af93b..c3ee2fa5515a33267fe77b98134a44de84fb21f8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragmentProvider.kt
index 100e7b34292c3fc3e106fcc2db4078628b2ac8b3..0f69677fe36bcd538a37dad04425dc18eca4e173 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/DragSortItemTouchHelperCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/DragSortItemTouchHelperCallback.kt
index 96382dd89248eb8a7cbb9fb6427f41aa2e32593e..37215b794144e6565544b6ef069fa941f62cd2e9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/DragSortItemTouchHelperCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/DragSortItemTouchHelperCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
index b8d7547fa2f979e0f22434bb80ef7c9c57fa9ae5..5c4f718699304107792158f10af024e4f674cca7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListCreateFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListCreateFragment.kt
index fa41b8df09a1a1da2de83114494a06eeb4b9b696..f6c13f48f25e8193d40bb02082811caa9796a920 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListCreateFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListCreateFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListEditFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListEditFragment.kt
index 9030a4ce062521f935fd09b70ea1fe71769a15fd..e2d523c52a30fdc09cf66c44a3466df31b20f9b6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListEditFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListEditFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateActivity.kt
index bf66e0b601bf062a307950beda5c4659388c9fd1..eadc3eaf5b03975195920a2af910e402e2deaf92 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateFragmentProvider.kt
index 3c8aa28acc3025f5996c491eed0c0b751de8ac96..a221fae19649b1bc3ffd4d1c105fa18b68971f74 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistCreateFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditActivity.kt
index b2bc0d36bebbac9f04247e6c0eb65fd72c216a7e..62ff683d24d08b0afab8c3891702c8290fd8faff 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditFragmentProvider.kt
index 938c3f195e13aefac3fcf2549f6662818c917d56..4501ab2fc92926692f01282e23a430ed98b50c1f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatlistEditFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityAdapter.kt
index 69b43bccfbf5532a5cf87d2ce660150d724bc4b2..7b2e68a59888badb5d844456153bbed26a8ddae8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityItem.kt
index a39395777e643c04f604a07a68b521093227afc4..a5c4410d309a787eb2a2f2a118be65e21c64a0d1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/MinimumActivityItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
index eec7f8deb0fd0ff1f16958fa7fbbf8f7869ae19e..38c96759b2be0d0a3741ece6188365f6ae543569 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/DragSortItemTouchHelperCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/DragSortItemTouchHelperCallback.kt
index f9aa80b11b8dcf9ab4f6571c66839e9c272192e9..0a3936b7a3213cf7a0e963141ede9a3c24eaeda6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/DragSortItemTouchHelperCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/DragSortItemTouchHelperCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt
index 30a73516b5af9a0c03567816e821a294a459561d..d411505091da2afffc5a815fb5192e06d2195dc4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt
index 7b24e1e84a4ef7f5707dd4df15cb45e747418d85..5c92d82c3527131a633c8174ec06f8673a1b920a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt
index 685c3b0b4ace90d280b6d52b0731fd09670c70f6..bf84ec7fe1a4a8e976ea802a06169898f0de6633 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightListFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeAdapter.kt
index 02ac93871cc7cb412754bba7d5a817297bd9525f..fcbbdac841d39ed4ba2ab784c241ca80774f2f70 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeItem.kt
index 7a535153f902e4fdbdb8ffa5262e17d32d41d3c2..7132c0f244196484d846278a24ed9a7b39d39dcf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightNickTypeItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightRuleAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightRuleAdapter.kt
index e409df965df09714769ca61226a0a6c457684cda..7209604fb1543de5093ff94b396157b2e4c687d0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightRuleAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightlist/HighlightRuleAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleActivity.kt
index 1d422b086ef484b15301de647fc1d7f54f121c2f..1ea9c2b81f30923afbaa6e41275b20faa3237b8f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragment.kt
index 0e00be20eaf9daa7e9148c2ea8ddcda7a6f8569c..1c106a3fcae0ff8a6c018806ed08675857a42900 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragmentProvider.kt
index 62db0e492ed6fb91bba7350427d5a470ab6bd522..15b8def5be188678df0d84ee15d801270081010d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/highlightrule/HighlightRuleFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/DragSortItemTouchHelperCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/DragSortItemTouchHelperCallback.kt
index 632120faea1f03150786c5a63fa3d001c796ea0e..2dc65ac2fcffea04466be55f48314dbafe28679a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/DragSortItemTouchHelperCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/DragSortItemTouchHelperCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityBaseFragment.kt
index f2b7eef996e4e3d1c454f01a81b650aefea3e617..cbac4065246bc82d9ef51cc8b95b7513c931287f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityBaseFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateActivity.kt
index 09f8cb3718492479154b6e50ac1ace157549e100..bb47fc47f62e95ba5c328aa35c1cea30c3d0a569 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragment.kt
index f42cfdff4bde8453075d94c7e7344d63d973857d..a48e21f2aa046ac12d99bd9799f2221c9918b9f6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragmentProvider.kt
index 00695aca8544e5b0a3e7d885bca71abee5c6a08f..f7d06ce1d81a64f06f37e6c5bc52e036d811b5c0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityCreateFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditActivity.kt
index e059f7046a54047d8bed1f003c07a9682e924a67..46624356d49e87da244bca720aced52bfcda00ca 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragment.kt
index a116cff27aada32ceb6a0f5e3bc740ea0550ef29..7f7f542bfa868b82b6416c2115d6cba5b072e740 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragmentProvider.kt
index 23ae48862b81c48ca032ee4930054a0b05976f91..b776ce63d255fea2227d9aee3c93a6f659cac043 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityEditFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityNicksAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityNicksAdapter.kt
index 2b51e97bd6deabac4355b328a6baa3294d59d12c..86d94b266c97eebbde45bae6f162ec50793d9d95 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityNicksAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/identity/IdentityNicksAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemActivity.kt
index 42e38ea896f2a6f67c3b8a5e548c6e807f11c7af..70269d0d9b26f9520ac7d3ea541f9f714704f8a9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragment.kt
index 176c644fc4c04b35b65ede6030368189837d203c..c097f1cd93c032101f8667d6eaca643b764d642e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragmentProvider.kt
index 642cc5136072fd6176f64850293ef72155979c66..55beaead4dc07ed38688b43c463a94a0ea83f561 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreItemFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeAdapter.kt
index 8c7640fe375a32fd6b2acd7866c8005d85e0032d..522494642474b32099eb8345a56975a939d09b1c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeItem.kt
index 9b76f0859a150b94cc650665898a8a8766ad5e41..2b5e20002d7e78b3d9f8b47778fd346a8e86c6dc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/IgnoreTypeItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeAdapter.kt
index 3dc54c42886669e5f2263a7dbb56af8bf14bbb92..075868b35f621efa0b2d18246efea0e599d10bfc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeItem.kt
index 7251eb8c94ae586d3ff8beff8a69ff38a41227c6..16f4b62b10ece8da339e6345b464f031a80293ab 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/ScopeTypeItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeAdapter.kt
index 7c33c05221c2e77ba9d8d1473ffa32fb6bcb3898..b4a1258e03e757525b1148326539e8d740ba20de 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeItem.kt
index 4bc793697203a78f571194a3176547926e5f997c..dc4f6f7261be85c9ffaf13907c79712f246353f1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignoreitem/StrictnessTypeItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/DragSortItemTouchHelperCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/DragSortItemTouchHelperCallback.kt
index 1d3947d29baab71eb82a5213684665b623bf1a9d..a83aa7e99dd180814d517bfbfce485dbbf6bef5b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/DragSortItemTouchHelperCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/DragSortItemTouchHelperCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListActivity.kt
index 81f324ed587293212384a84def06a745422088cb..83406cb93a41e62d3fe249ef85756e7d9c855787 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListAdapter.kt
index 8aa267ce0bf868047ab2986cc295212d4d0e3e25..e9f73ee09b2ced1b1d64b53d4d8b70db5a353afc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragment.kt
index 31d39c1812191f491a83f31dfea19bedcc52c96a..ab09e8289d0d7de17a4fce6290780014473e6ce2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragmentProvider.kt
index 676de8beb792a2c4f76247fd9f9b63f0961d8c6a..0eb9b57d4565dbe01d6d1dba9fd298b1a9c4eb8a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/ignorelist/IgnoreListFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/DragSortItemTouchHelperCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/DragSortItemTouchHelperCallback.kt
index cd779d7e4dfe650e4f84ee35d5d838fae27b8eb4..fff414bd73be50abcc5898df4315f312218dc4f9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/DragSortItemTouchHelperCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/DragSortItemTouchHelperCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/IdentityAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/IdentityAdapter.kt
index 168ad7fdbcc2656f241a4079396f3c84b6c11bf6..24803e0ad567083d8c86c6cd59e3ee2a078d3af7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/IdentityAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/IdentityAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
index d589bb0a7814ec17ddae362b57ee5a54b8eb040f..9ac932fe4e3c8e517ea37006576f50f99e08acaf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateActivity.kt
index ca7e9cf071e8c6fdf01834907a9f2b69f161cfe5..ac75bbfd09789f93451b8c3fa6102039aeeefeee 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragment.kt
index c07484c31382a20a412ba9fbd705b20828b6586a..7985c0fe2d3dfba58516fa12d12e60dae3650bed 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragmentProvider.kt
index 5a3299ba4f13677319a72e1a31c5a19411ce19ff..da93afe7b237643973235c4cd27eb308b59bf1db 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkCreateFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditActivity.kt
index 241762153c7a013db72bc5ba294f94e5645d1a83..3be6af1fd3fb16617a3c66b632f52325b85d2dd3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragment.kt
index 48ab25e667199d67112f035b9507bdd126630f0c..aa5bf98792dafc853c799640678a64a45cdffa71 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragmentProvider.kt
index c845858546c93514c34ff6bb7d37ffe58a1cb21d..1cc30b964bae8ed8abf06dcd3c34f70835ab6466 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkEditFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkServerAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkServerAdapter.kt
index 1c89993b9c22b9c2965295163d11591b17c756c3..1a0e7d0e76747af38776948c89754d3db7fc765c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkServerAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkServerAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigActivity.kt
index 502bf218a0589064d7dc4389e7bc6d9d11229721..606d21febb1a0ab7479c3016a3f64681b6a73975 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragment.kt
index 6f09e8e20afd47a5bb4e96dbf48e9d0f238ddaa2..3248b46c3388521b785e9e4959be5a12b8723fe8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragmentProvider.kt
index 33993d9f5ffb2c43e053b4eb372176a09d956613..f6c90cc94f4dd13ac643dee04d5c8fca5b2bcb6d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkconfig/NetworkConfigFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerActivity.kt
index 6d60d529a20edcbe77beb18bdfdc87805e2feffa..0d2859bb6209f5b8c6a21cf6cdd5469e0196bf7a 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
index b249b13fb7d4a11ac995c0e541e7b1e6df1f7495..0121b1f4b35b25190c8fb569959ff28bf6a104c0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragmentProvider.kt
index 9886571b1c3fede8764e7cb58d1ee8cb748a80cd..888e0e3e598c1870640df30cbc04a9e77f5cb3b7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/NetworkServerFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeAdapter.kt
index d1b71bde0a9b44fd44460988cdd960e85efdfabf..5f129f71c789eeef713dd23a5657c40e0946a8d9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeItem.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeItem.kt
index 35198f41d6be3c34c7053ae2a4ccc86118472691..f7ceadc2c0108aa32c698221a3d0b9971022cbb6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeItem.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/networkserver/ProxyTypeItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
index df93f88eaac00b804506ef8cfc9429feedc593e0..098ac1d77ca10fa0e38c8c7adbf26e3c30b090d8 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
index 76a397490258e426b9a499bc2bfd037e06adb3b3..36183b6c057bbea719a16f985d9c378cac18ee68 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/SlideFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
index 1b4717a436b28e75e353c9dad9915a059049fbe7..5ecd41b6237d4a227e007207f248fd81fce084d4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ValidityChangeCallback.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
index a607bb5e24075202ae1cfc9405afd449788ef264..cfa4c68b19fe883f7d6cad6764e2722ff7cbfdfd 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditModule.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditModule.kt
index 5d2e19c9c75a02dcf3a01c70b1b0ea890eb75491..7fe416289909bebb475cbd7bfcce6aa7d7484b4b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditModule.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
index 6567f8e6aeb0b3249aa25f76342a0166277ad2fd..ac33163ec229734353ce1fc3bb7791443ca78f0b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionActivity.kt
index 89f014cc298122c9451b83f70ac3a254bfc8bda7..1fef3a39bcfd3c71f9c5ddb0e525b5080a15c41b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionFragmentProvider.kt
index ef739d9a317529655494d9da29f53ebe5ee80ea3..468a9bdb55ec36183c8897177b2385b31569f0f4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionSlide.kt
index 901b96c0a2579e7b415ddb0cd4d5efe14774aa1f..13d1d7411846a9d2d75102bff240ea52ecc8ce68 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountSelectionSlide.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountViewModel.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountViewModel.kt
index b9f9876e9ca1070a479d4c5186aef05c4bc13a68..a43c51f86c98f84a186f0c7a6e2a0e13e9768ec7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountViewModel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/selection/AccountViewModel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupActivity.kt
index 7c65ea658364f34f6a88a4defa29b15fe2a79c34..42ceb5cad20ee45c7143ed29e323cc6a793c7ea6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupConnectionSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupConnectionSlide.kt
index 3584f6b54228c538ccb5346847d88b29bfadff0b..b8d8af153ad5129a2a47879aa286c575030144d1 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupConnectionSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupConnectionSlide.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupFragmentProvider.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupFragmentProvider.kt
index 1a24f9b9077576fa0df54360f54b3cb02e39d6d0..fc16d15a30495f8ab5c923c18584c7e4cb717219 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupFragmentProvider.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupFragmentProvider.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupNameSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupNameSlide.kt
index 543907d57a9be159de46d37a0b81152dc21a1c6d..9433954e02a162c4c93a33d9c561263a442bd319 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupNameSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupNameSlide.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupUserSlide.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupUserSlide.kt
index a54a3d03e9cde176381ca880c345d69d1d3a4c4d..736323b0ed933450fd3fa264dd4da45b77f5226d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupUserSlide.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/setup/AccountSetupUserSlide.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
index 69c4ab8af22bc092f2a2ce2b86342df7c315e47c..70bb726bbc7f8a6e3cd8a163115d0e30dfbb2f65 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/AndroidHandlerThread.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/AvatarHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/AvatarHelper.kt
index dd3de78bafc822a11103970cad37f1a9c5dddf4d..7bc4535e9569dfcba8ffcb72e154eff8416ef83c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/AvatarHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/AvatarHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt b/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
index bfcb232e870f7fd761c02d4718899092011f14f3..42d605ffb999db326e30c92724ccce2c35aeb941 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/Patterns.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
index b53591dbe1e6c226713e8c16ca03f0bf7feca46c..a75a08ecf8775e2eabd9b0534ea1ad323e6870b4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/QuasseldroidNotificationManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt b/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
index f2d7cc67ed599e5be6e2eb6386ca7a4e18155447..9bd7902fe5f9cbcd034d33cf2abf81edea528e8c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/TextValidator.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
index 52addd4334374fda07bdab6449b63e5e468c0758..f9a7f4b58da8d4391e6efc6abef857c939792ed7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/AndroidThreeTenBackport.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerLifecycleService.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerLifecycleService.kt
index d001fcb1cec4a411256ff36b45a078297154386e..1ff241ee80029b1ae46fa57adcc38f48f90ea695 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerLifecycleService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerLifecycleService.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerPreferenceFragmentCompat.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerPreferenceFragmentCompat.kt
index 974c1c7bb04a2c8596fa279bfa87dc3144bd5791..36726c8ec83e1449d86171f4d79d1db7babc4230 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerPreferenceFragmentCompat.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/DaggerPreferenceFragmentCompat.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
index 7d14e43ed20f6b5856efdb4d328b7462d9ce33e9..f6201cb04b08bad3686cd5a55f9cc8030e454942 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/ReadableWrappedChannel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt b/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
index 222e2f08c0de6910901abae23000ca64919d05c6..d22ca1aad16e80ee7d70af4369b0ec13d76a8c28 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/backport/WritableWrappedChannel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
index ea5796ddcfb9f9685efba0aabbc89ae2114dd618..93d1fd68aa07f5e2e2dcad3d89c1b962a0ec3a99 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidCompatibilityUtils.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
index a5531f01c5f7e9ed75831d2192e2f14880220ce3..506e6ea4481258fe80b31330d1bbc6ac5fe3844f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidHandlerService.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
index 090267e28d7beb29f743c0ea9c5b6d85f3552f49..2c040217dbdde8919c3fc51040f200beffb0130b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidLoggingHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
index db561a64fd2cdf321e29cd7ea99a329e629de889..89524b6c0ed2da8a60448be2e058c7a4dbb084a4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/compatibility/AndroidStreamChannelFactory.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
index 4af1056f94e6e046e198e8e559616255a19b03fe..5296c26d2545164742aed91ecb7fbbff99e70b0d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AccountDaoHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
index b7f7ace0f84e82df074e5980ea95620f8b7cbba2..7d70db36c44bee5744cd859ad12960f54a523f60 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ActivityHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/AnyHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AnyHelper.kt
index fc768ea1d07d26e12f42aca1c51bfb5625bc4d86..c8813d2ca2abe5859a5c591e31e17393cb65a497 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/AnyHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/AnyHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/BooleanHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/BooleanHelper.kt
index 7fe1954857557297e72b8c14bad75f6ff5c80554..c2131550b20f360d552ea249319d17d3ccc0a1bb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/BooleanHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/BooleanHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ButtonHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ButtonHelper.kt
index f538535480fbd1c887f35d13dafbf92e9353b4c4..53fd32f0e49d546f157f40a9c94e0a9764d61419 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ButtonHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ButtonHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
index 8ca9697d260fa31d37b5ffbf881f32d5c87c63ac..50e4dd92baf919f6cfcba1f44df3a148e8ec04cb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/CharSequenceHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
index 378446f2f31248b2a1c91ea07cf08873a930d2b8..2de1af0fed92141fd8b736a4df56f8d517d44eac 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ContextHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/DrawableHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/DrawableHelper.kt
index 7918e4c22453b2093d596ed4015bf8f01aea28dc..8935c69250fe6a6da124cf89ed2abeca7617ee07 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/DrawableHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/DrawableHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/EditableHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/EditableHelper.kt
index d437c616ad4651fc69195d3354dbd3b250170152..a81aeb81d715e58787f0f5f6d5834f0ad59e1d02 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/EditableHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/EditableHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
index 44501817c2e2fe518977e085c0d090af5abcdcf1..6132cbdd3e28dc322076337177930bcb72f45011 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/FloatingActionButtonHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
index cf93b37877ae6d3a18ad2300d1471eec227408a7..05e03ffbeaf8f1945940fb5bd7dbf24313e13683 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GlideHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
index d7804594681ad3bb85100ca5a42854fd2d27e2ef..c6ea4702f81a128a43833376d784e64a08c34142 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/GsonHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
index db65d7a887ff9d8c3d75e5243238261f5a0bdf9b..e7ccd908801d33b731f378100568816cdf3a794b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntProgressionHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntRangeHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntRangeHelper.kt
index 931248ebd6f0ce7c340fc2a9f8fcfd2025741faf..ea6720ed6b30c38390d808e786449961c50a7f96 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntRangeHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/IntRangeHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ListHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ListHelper.kt
index 11969d4310edf996d03b197dc37528a5e85ea4ab..92dbb550706a676ded0eebdac9d7c04bcf8045cc 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ListHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ListHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
index 598552fe276a67464ee8e251a55d71917e04fb37..885f35acfc258e5d1df201212ce09f340096868d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/LruCacheHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
index bea711ffd01fd31642b021ce54b5ef2df78ddb2b..2f607f1de47524b1b950f41554263cadc6b85571 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/MenuHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
index 08b2b68d77bdf09fea4e899145796d63333c9297..48e37c1ba5ff7ba1c5cbfd75cca50a895739c0b7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ResourcesHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
index facd5d9b22bbbc38ca34c3e51018199762c7de8c..af888905f34a78c16d8a24e528c767a85641b954 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SelectionHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
index 3e2f377a683844874e1f9d1d2c57da61c87ca06e..b82404b6a61ff6102b6bd7e1f849ca68f86067cf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SharedPreferencesHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
index d3d51a17111b9da77d6579c6ef9bfe54e6c1dc31..d01dd9824b0920e51cd79c1139a39539a8ddaf79 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SpannedHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SwitchCompatHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SwitchCompatHelper.kt
index 4ec07846326c155f97a788ee49bf617520aa9b20..e6d33f7616420343bbd927383ee13f633ed7283f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/SwitchCompatHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/SwitchCompatHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
index ad79f5292c58e6ed7acd13dc15741258041a9d0d..7bc6ecf31faf2bd54ed1a127ccb6481fc843fcc0 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ThemeHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
index 8bff0dedcd03e47ecc09172d719a224abe51cc9d..f5eeaa3328bc6299b1bed1b290fa024317eab0a3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/ViewHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/helper/X509CertificateHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/helper/X509CertificateHelper.kt
index 10a128e1645f4834471fe06d8f8b4d6961772f59..78cab0f7bdcc3954170fb2ae6426d42de602dd50 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/helper/X509CertificateHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/helper/X509CertificateHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/ContentFormatter.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/ContentFormatter.kt
index 8c35e4167056b46f82b11a8713051ef4514e9a4b..b869d97033a0e4c7afc0fa13742c268529b9f827 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/ContentFormatter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/ContentFormatter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
index a876712e181b431645240528a3b42f51696a7d31..c986c7c9f4492e2cd464f768d2f512ed61a04e25 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatDeserializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
index 10a0ae5fda3d3395de2fcf7d922b09147858f13c..897b736309dee086d4e5976ce8ab3da8430b80f7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/IrcFormatSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
index 8f0290290f052078563a8bf4f5920a023d7ea650..41e8a5e44dc09f17037fd921d0642d677979c41b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/Copyable.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
index af5be18bbee6be0537ca70d308445c86fee9b8d8..ffe506b7dd459ec34b4d7a0c25412c802c1fa6bb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBackgroundColorSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
index 0745202c2276de0f193d1193e986438cdaf357ad..2276486513291397a7847bfd4295a4d43be51bfb 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcBoldSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
index ac5014393b8d60b8fdb49ef3da401bf13a7bb994..6ba1e5bda3976af77b6d3757c7c78d2673e826ac 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcForegroundColorSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
index 78f17cb14f199cfb40d87f5d37dfabefffd7d745..97fe17f945ec6a89dac2640b50b35088c86230ce 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcItalicSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
index 4767f4b1a44e1e77205ba948f436ef44ec1f2816..1075b9f0eab4e448ad60680957c22002dfd92548 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcMonospaceSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
index 9be6ee5c10fda3267c4a3c60215a9238dc840398..123fbdeff2c6be1bfafbe89eeb417c85dc95e972 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcStrikethroughSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
index 2d052f8f9973d4b02490f15654fe73922c006393..52e485d4a144d4afbc84a99eda7b54bf906a718b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/irc/format/spans/IrcUnderlineSpan.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
index 9e31cd6b86a702ea04e677b9e9f2195ff43dea71..67cf7e1ffaace11737e3eb1c8ef709f0beaadd6b 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/BackendServiceConnection.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
index 5da403c0ab445e62e24d684a770b649b6230336c..5b6e04a92a4f019aa21c2dc99ee05322603b39fa 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
index ed86c01374a441f22f2abd9f18d60ea2bc66c495..9c1d3d91b826e7cf81d850febfe7d78b4c6a4aee 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundFragment.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/AnimationHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AnimationHelper.kt
index 2781f986b9bf5a2a621e0f07d27808801f584063..788fb0f51b3db97c0d7aa2c7b2d0359d75cbf4d5 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/AnimationHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AnimationHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
index 4d83ee17e80fee7810e73e6d14c9236541e05f3a..d3e7b86eec7196dcf3aca21a5c131ff5eed5b6a7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/AutoCompleteRecyclerView.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/BetterLinkMovementMethod.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/BetterLinkMovementMethod.java
index 89cde6d0d1a19edc2d061b36a5a357532f681ffa..90efe499ee7224ec4a75629eeddc96aaa4b97189 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/BetterLinkMovementMethod.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/BetterLinkMovementMethod.java
@@ -1,3 +1,25 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 Ken Børge Viktil
+ * Copyright (c) 2018 Magnus Fjell
+ * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package de.kuschku.quasseldroid.util.ui;
 
 import android.app.Activity;
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
index f8b9a8196d7347371d5b391dbd06121ebbd55cad..8588ed5b6a3a614a6b4a7735a912a1a784ad3fc9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ColorChooserDialog.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
index 7e8ecd3e0d2cf00e9497653f26d2a8a7435a744c..99d4a7055a3648fbc2d4565c65b278694aa8acc3 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ContextThemeWrapper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/DoubleClickHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DoubleClickHelper.kt
index 82ce2f70f3ee408167eb8f3ab24a7f4792245bc3..c93b5ea105f4cf184bf44c67a13c216c12457acd 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/DoubleClickHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DoubleClickHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
index 6ce2ba3767632d1969e53f6209d653581de869ce..965472d33d2981ff9f83df67b089f9f96a786309 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/DrawerRecyclerView.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/EditTextSelectionChange.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/EditTextSelectionChange.kt
index f7cb7263af99a607b4fe60bb58ea8182aedbb4c1..2d7fe3fd9094006299e8c6839cc7071f09f8e1f4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/EditTextSelectionChange.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/EditTextSelectionChange.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
index c2ea8a9004db40b716f1f6e79aeaab650946bf35..de762f53b37f721adef81e53b448742bc5efe711 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/LinkLongClickMenuHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
index 751f93a8012331a5659a6d0ae112fd1c59d8536e..aa7a9bea11e1e51cf0f41a327cae0bf4991ecdfa 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RecyclerSpinnerAdapter.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/RipplePassthroughTextView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RipplePassthroughTextView.kt
index 67bf9d6d1ebedc831e8d721b682cfe9326395f41..b2980347a73394be86322feb30da36f44753cb03 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/RipplePassthroughTextView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/RipplePassthroughTextView.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ServiceBoundSettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ServiceBoundSettingsActivity.kt
index a0eb4b5324adb4b84855364e6087fd366189ecd6..f0f8b2c62bbb7d2d8c0110c1230c7502e38ad148 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ServiceBoundSettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ServiceBoundSettingsActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/SettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SettingsActivity.kt
index 6c412bee38dd77960d7e4dd30d0dec9b431c3bfe..440a77623a88df8401f214190ce47758c9e857e9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/SettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/SettingsActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java b/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
index 20c37bcdc4408c8a3fc845d2ab1f74d5fb50c7f0..1171bef0077b4c94ec280e0e630e779c08dc301e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/TextDrawable.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ThemedActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ThemedActivity.kt
index aafa347976102e0100b0c9440ac2c6fd84852b75..fa726db132a2c789ae8a07a42831949d16bd21fe 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/ThemedActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/ThemedActivity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/app/src/main/res/drawable-ldrtl/ic_send.xml b/app/src/main/res/drawable-ldrtl/ic_send.xml
index 0f824d2f652d8f4a2688b1e95d0336cd9607fe11..3094ac73751ee1a35bc12c965e46d243e5dc4a94 100644
--- a/app/src/main/res/drawable-ldrtl/ic_send.xml
+++ b/app/src/main/res/drawable-ldrtl/ic_send.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable-v21/bg_menuitem_dark.xml b/app/src/main/res/drawable-v21/bg_menuitem_dark.xml
index c1e437c995ce20d4fbbcf4c75cd72021e33974c7..f851d71fb532fff06b51638dd7e03444dca1f16a 100644
--- a/app/src/main/res/drawable-v21/bg_menuitem_dark.xml
+++ b/app/src/main/res/drawable-v21/bg_menuitem_dark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable-v21/bg_menuitem_light.xml b/app/src/main/res/drawable-v21/bg_menuitem_light.xml
index 8d7decb31df9d5e8984d2d873928bf922bde58b5..a400b6498a85958e3e3ca9d858b866180b26b9b6 100644
--- a/app/src/main/res/drawable-v21/bg_menuitem_light.xml
+++ b/app/src/main/res/drawable-v21/bg_menuitem_light.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable-v21/bg_menuitem_rounded_dark.xml b/app/src/main/res/drawable-v21/bg_menuitem_rounded_dark.xml
index b0708709014bca62f88ad41325a4354cc43b47dc..b8048055705914465680056f33a75fe6f37377a4 100644
--- a/app/src/main/res/drawable-v21/bg_menuitem_rounded_dark.xml
+++ b/app/src/main/res/drawable-v21/bg_menuitem_rounded_dark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable-v21/bg_menuitem_rounded_light.xml b/app/src/main/res/drawable-v21/bg_menuitem_rounded_light.xml
index a5d6304e33589943ba611a4909c8a0b47bcfb23b..af9628f2dc771cad0cc5f07d250bd976cb13b487 100644
--- a/app/src/main/res/drawable-v21/bg_menuitem_rounded_light.xml
+++ b/app/src/main/res/drawable-v21/bg_menuitem_rounded_light.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable-v26/ic_launcher_background.xml b/app/src/main/res/drawable-v26/ic_launcher_background.xml
index c6bcd638264b075295beb3af6999f1b4f538d209..bd213fa08e632fc68567a30ee384b7e0373621bd 100644
--- a/app/src/main/res/drawable-v26/ic_launcher_background.xml
+++ b/app/src/main/res/drawable-v26/ic_launcher_background.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/bg_badge.xml b/app/src/main/res/drawable/bg_badge.xml
index dd5fd2f1ea3ed8de75302b7dd3e88f7b3c407608..7e171421fc2501e78688bdf003907cee10257671 100644
--- a/app/src/main/res/drawable/bg_badge.xml
+++ b/app/src/main/res/drawable/bg_badge.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_intro.xml b/app/src/main/res/drawable/bg_intro.xml
index 645b2638866697768b212860a29004e2b3614590..61090dff9c423d71eeb3792b5c69806628111c73 100644
--- a/app/src/main/res/drawable/bg_intro.xml
+++ b/app/src/main/res/drawable/bg_intro.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/bg_menuitem_dark.xml b/app/src/main/res/drawable/bg_menuitem_dark.xml
index ef3ba9cdc87d6e0605b904560e01c2eb378f2147..ebcfd02b5bdc74287b147364e9d7746f4d1d10fe 100644
--- a/app/src/main/res/drawable/bg_menuitem_dark.xml
+++ b/app/src/main/res/drawable/bg_menuitem_dark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_menuitem_light.xml b/app/src/main/res/drawable/bg_menuitem_light.xml
index d2a62f013ee5a998204c5c6923153e656d528bb9..184a4662383ff0d9f7c8d80d92097bf38fcb53b9 100644
--- a/app/src/main/res/drawable/bg_menuitem_light.xml
+++ b/app/src/main/res/drawable/bg_menuitem_light.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_menuitem_rounded_dark.xml b/app/src/main/res/drawable/bg_menuitem_rounded_dark.xml
index 831eaf531b1a743be0d77d12a6e725bc9aa9934d..6f406a94942b7cf8cf935ed6bd46eb2343a7699c 100644
--- a/app/src/main/res/drawable/bg_menuitem_rounded_dark.xml
+++ b/app/src/main/res/drawable/bg_menuitem_rounded_dark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_menuitem_rounded_light.xml b/app/src/main/res/drawable/bg_menuitem_rounded_light.xml
index e8c7e0209b622e246106089fe87860135b12d2c0..c2ac3fcdd1dff10e29802f2a094bb10b96c14207 100644
--- a/app/src/main/res/drawable/bg_menuitem_rounded_light.xml
+++ b/app/src/main/res/drawable/bg_menuitem_rounded_light.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml
index 221c18c3570f4cfec3e02a23c1b148a5c450a6d9..57f1a20a28c64f1a36a13e49437ead9b4f8544dd 100644
--- a/app/src/main/res/drawable/bg_splash.xml
+++ b/app/src/main/res/drawable/bg_splash.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/bg_transparent.xml b/app/src/main/res/drawable/bg_transparent.xml
index c1dd3a435846185ddf7611457b835a9f32a05399..c85d62986a810c1156a7deea54e29cdce3924cb0 100644
--- a/app/src/main/res/drawable/bg_transparent.xml
+++ b/app/src/main/res/drawable/bg_transparent.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
index ee5844b2108fe2753895c75111d0cec8d4a2b85c..04f501f70cd7d2050c5a6cb35832ed62f7d778df 100644
--- a/app/src/main/res/drawable/ic_account.xml
+++ b/app/src/main/res/drawable/ic_account.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_account_card.xml b/app/src/main/res/drawable/ic_account_card.xml
index b779cf46709bc832ec27548b45ee44f0299f0c28..b650f74dc0aae2a0c7b572a7bf4fab520c7973bb 100644
--- a/app/src/main/res/drawable/ic_account_card.xml
+++ b/app/src/main/res/drawable/ic_account_card.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_account_minus.xml b/app/src/main/res/drawable/ic_account_minus.xml
index fb47a37a160d95a27de788fa07112cb37bd11653..5160daae7a3c1239be833325e319a912432e2275 100644
--- a/app/src/main/res/drawable/ic_account_minus.xml
+++ b/app/src/main/res/drawable/ic_account_minus.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_account_multiple.xml b/app/src/main/res/drawable/ic_account_multiple.xml
index e60a979b9f2162b832aa4ea5274b559c3a106192..505c2220f139b919aaa2388d82a6b741da9b3e31 100644
--- a/app/src/main/res/drawable/ic_account_multiple.xml
+++ b/app/src/main/res/drawable/ic_account_multiple.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_account_plus.xml b/app/src/main/res/drawable/ic_account_plus.xml
index 2e6832210c4c9019c3d480af26f165dbb3dcb3c0..53bcb4ba5434dc20e9f136be68ad751030982923 100644
--- a/app/src/main/res/drawable/ic_account_plus.xml
+++ b/app/src/main/res/drawable/ic_account_plus.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 8c3c551f4ff1d987b124b8b14f8bb12dce7fe74c..b6a34aeac38d8d984813bf9fdd7012135ba1f4c4 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index dbab59fbe9a170f11a03835f32a2512166353f8f..d7748cd4b06391bfd6d8e2dd4d21f99d3f062180 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_bell.xml b/app/src/main/res/drawable/ic_bell.xml
index 32e1683cb84545d44c6ce169876dbabfe5c369ec..dffd1aaeb8888457d173f8837aeb9e8094203dd9 100644
--- a/app/src/main/res/drawable/ic_bell.xml
+++ b/app/src/main/res/drawable/ic_bell.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index 8403c123c22b43b4edb3bb3975bbe59f2eeb5198..9f31f03c06d54b6467d1652e71b9947c9d3aaa33 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index 23b14d6a6dde332c72ac636298e70248230b9547..ca73d33a9536c427aed264349d3a17f2bad3a144 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <!-- drawable/chevron_down.xml -->
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index fce4025a1e56ed4473517ac8ba332036872b8f34..1a8132845cf590a6821fb40193861008e77ea362 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <!-- drawable/chevron_up.xml -->
diff --git a/app/src/main/res/drawable/ic_clock.xml b/app/src/main/res/drawable/ic_clock.xml
index 5d35712b1531a21a9e6c44fe8bf8b7ce67c01531..71c0e4b731bcfb942d1c2a258a819534153904c2 100644
--- a/app/src/main/res/drawable/ic_clock.xml
+++ b/app/src/main/res/drawable/ic_clock.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index e76f23b314f3d8d028f213135dffdd2d0d2e6a47..1306d2a97500d4c2df021dc82a37d12cf3727359 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index 83b8e151a24aa90b65add0e51f09bb1f762608cd..ff7c19d7ae9c607ef12969fb85698d4c849461e6 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_debug.xml b/app/src/main/res/drawable/ic_debug.xml
index c7914e954127ef12711dd10f2777516bc392d3b4..00663d1c2aa2347039c85feb81f85f6678f58344 100644
--- a/app/src/main/res/drawable/ic_debug.xml
+++ b/app/src/main/res/drawable/ic_debug.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index cf3e294172a02286efc5319e2617cb3b949fe38e..a8d3103e7735a29ad31b7c723c100810266fd4eb 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml
index 0e3b6789c3ef015f3c206aa737f8afc3d6add379..9ee280142512951a44b147347750c46e32c839bc 100644
--- a/app/src/main/res/drawable/ic_eye.xml
+++ b/app/src/main/res/drawable/ic_eye.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
index f014961e7a7555e21795c2bd703463fca25cdb46..1f0d82f22a822e8ad0ff1f4de414b52af959727f 100644
--- a/app/src/main/res/drawable/ic_eye_off.xml
+++ b/app/src/main/res/drawable/ic_eye_off.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index 6d2f9135c5f01e92c39b25455d575d92972e6d29..7c4036f513bf1aa93861000a56ff00ba81ab670a 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_background.xml b/app/src/main/res/drawable/ic_format_background.xml
index 1f51c21400796b54b7d17ea319abd9ce6de52fc7..2f2a077f915f0ddf27670c7d64ed5ee2c22f4623 100644
--- a/app/src/main/res/drawable/ic_format_background.xml
+++ b/app/src/main/res/drawable/ic_format_background.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_bold.xml b/app/src/main/res/drawable/ic_format_bold.xml
index b75334b489618a3be1aee6348afe21ce37db5990..c0f0d5a5c2eb9c44a10aad7fe07a1e46d24d098c 100644
--- a/app/src/main/res/drawable/ic_format_bold.xml
+++ b/app/src/main/res/drawable/ic_format_bold.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_clear.xml b/app/src/main/res/drawable/ic_format_clear.xml
index 921ed53a3ed3801a0a8bd6f1fe839356c00abb97..92c81a264197cde98dcb0a69a7ce8dbc096eb8fb 100644
--- a/app/src/main/res/drawable/ic_format_clear.xml
+++ b/app/src/main/res/drawable/ic_format_clear.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <!-- drawable/format_clear.xml -->
diff --git a/app/src/main/res/drawable/ic_format_foreground.xml b/app/src/main/res/drawable/ic_format_foreground.xml
index ce37671b0bc7be13a2300b57aee27a3ec4a13b2c..bc15ffca668bc15fcbf7d966276f10aae45adebc 100644
--- a/app/src/main/res/drawable/ic_format_foreground.xml
+++ b/app/src/main/res/drawable/ic_format_foreground.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_italic.xml b/app/src/main/res/drawable/ic_format_italic.xml
index 9ebfc75e667129dad5a735d05e41fdc6faf2a20a..a4d3d7bd2b222cde0b8d4a7b428b0d39b6ab4ff0 100644
--- a/app/src/main/res/drawable/ic_format_italic.xml
+++ b/app/src/main/res/drawable/ic_format_italic.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_monospace.xml b/app/src/main/res/drawable/ic_format_monospace.xml
index b08dcf9dd31efccade759b4a1c4371907a86665f..e7fadd675eda1f3ca712050652d3ae9829144bb1 100644
--- a/app/src/main/res/drawable/ic_format_monospace.xml
+++ b/app/src/main/res/drawable/ic_format_monospace.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <!-- drawable/code_tags.xml -->
diff --git a/app/src/main/res/drawable/ic_format_strikethrough.xml b/app/src/main/res/drawable/ic_format_strikethrough.xml
index 482a8ecb626c35290a0417ed26c94375e8df74c4..b924b624d48acf50d746f5bcba8d9909946f4be1 100644
--- a/app/src/main/res/drawable/ic_format_strikethrough.xml
+++ b/app/src/main/res/drawable/ic_format_strikethrough.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_format_underline.xml b/app/src/main/res/drawable/ic_format_underline.xml
index 14e1f858de6064630fcba026701105b44cce3693..3d9f5826872b8c4dadbf93cf9297b0ec8cb14ac9 100644
--- a/app/src/main/res/drawable/ic_format_underline.xml
+++ b/app/src/main/res/drawable/ic_format_underline.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index 70a17d2f2a6b370e40fbd22b438522252d94dc00..d5a78d39e4034c897d0b42b2feb6d5e6b96546f8 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index 6910b33be0196b9ad4f3566258bc8e0625653618..cc939e2bb461e4ca9fdbaf2de3e219e2c2cbcbf1 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 436498ab2075a28445c24240984541eb8237a76b..7fd23d8efed20604ba8f8fe7cf9377ca7b898bee 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_key_variant.xml b/app/src/main/res/drawable/ic_key_variant.xml
index b4d32bf20edddcee0ebbb055b63561276dd5dd83..352f730856e77940b37f0d2f4d8861ad1395db41 100644
--- a/app/src/main/res/drawable/ic_key_variant.xml
+++ b/app/src/main/res/drawable/ic_key_variant.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_list_bulleted.xml b/app/src/main/res/drawable/ic_list_bulleted.xml
index 2d8ccd6fa7d2cd3f3b81ba2c97980588c5c51f26..3c74245cecec0eeb6b77b95ef2f68fe2aaaa39ba 100644
--- a/app/src/main/res/drawable/ic_list_bulleted.xml
+++ b/app/src/main/res/drawable/ic_list_bulleted.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index dfd500bc330c57a754bf4921e2a4ac42e918bdee..87b43ac6053a09c4a2114a11a3be5b1a56c61ce9 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
index d441cf9dc091adf16a6b65ec6f30a6e72807f196..8c41875e9aabbed8ae2885ddbf2d4a1f0af8b4a7 100644
--- a/app/src/main/res/drawable/ic_lock_open.xml
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_message_bulleted.xml b/app/src/main/res/drawable/ic_message_bulleted.xml
index 70e610089a2a5ff7e95e215faa67f7671bed23b2..c4f785196c815b57d44743709c1e330bf87e0806 100644
--- a/app/src/main/res/drawable/ic_message_bulleted.xml
+++ b/app/src/main/res/drawable/ic_message_bulleted.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_modify.xml b/app/src/main/res/drawable/ic_modify.xml
index c679caa085887d5190b0c47e22e60aa39a25c3f2..5bb6803ac356ced7a0cd3c5aee2632ca4654b7cf 100644
--- a/app/src/main/res/drawable/ic_modify.xml
+++ b/app/src/main/res/drawable/ic_modify.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_pencil.xml b/app/src/main/res/drawable/ic_pencil.xml
index c679caa085887d5190b0c47e22e60aa39a25c3f2..5bb6803ac356ced7a0cd3c5aee2632ca4654b7cf 100644
--- a/app/src/main/res/drawable/ic_pencil.xml
+++ b/app/src/main/res/drawable/ic_pencil.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_reorder.xml b/app/src/main/res/drawable/ic_reorder.xml
index e02c507c99d370c875b6a30e30a8aa08d9e7ce78..4e0c0e65e7378d8964544314d5557eb23546d89f 100644
--- a/app/src/main/res/drawable/ic_reorder.xml
+++ b/app/src/main/res/drawable/ic_reorder.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
index 5a881a031791a4c01bca38ca2a20685606a0cc46..7e6e449f7ef1fee6ebe767654ef48b696c101939 100644
--- a/app/src/main/res/drawable/ic_save.xml
+++ b/app/src/main/res/drawable/ic_save.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_scroll_down.xml b/app/src/main/res/drawable/ic_scroll_down.xml
index ef25d44bc34ac181132c2ad991811e8843b8fe88..75f40ab59f2c03bbe8fe52b6e1dac46fcce2b6d5 100644
--- a/app/src/main/res/drawable/ic_scroll_down.xml
+++ b/app/src/main/res/drawable/ic_scroll_down.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index 568721dc9d29dae164b4d2a8351c72fc1716d54f..7238a444823e6fc6d0d5333731dcf154c5b96307 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_server.xml b/app/src/main/res/drawable/ic_server.xml
index e4d0665e8f1aa8133003760227c4efbb19597a8f..abc68604fd6ea226e74d4f84d250a740fb86c934 100644
--- a/app/src/main/res/drawable/ic_server.xml
+++ b/app/src/main/res/drawable/ic_server.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_server_network.xml b/app/src/main/res/drawable/ic_server_network.xml
index e4d0665e8f1aa8133003760227c4efbb19597a8f..abc68604fd6ea226e74d4f84d250a740fb86c934 100644
--- a/app/src/main/res/drawable/ic_server_network.xml
+++ b/app/src/main/res/drawable/ic_server_network.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index f532bfd12fd10e6e48ae825ab546c4e396c84afe..ea7be8ae968e5551e3ee478036fdb0f3e3378fe6 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index caef29509c8a0d64831b2c738993c5b788e4ef8c..3819d1befda62c7cddbe6b6f7b814ab1f05ae366 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_share_alternative.xml b/app/src/main/res/drawable/ic_share_alternative.xml
index 22b1ae5c11066ab31dee7c46c2c8199ed1c8f7dd..e56f8f48210b850bd969df0c7562d967334298e9 100644
--- a/app/src/main/res/drawable/ic_share_alternative.xml
+++ b/app/src/main/res/drawable/ic_share_alternative.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_shortcut_channel.xml b/app/src/main/res/drawable/ic_shortcut_channel.xml
index 3827634b513b125d5b1ef17a7331510b09b25405..c88c8acf5f074fce80ebf6b4c615425dfb01ba22 100644
--- a/app/src/main/res/drawable/ic_shortcut_channel.xml
+++ b/app/src/main/res/drawable/ic_shortcut_channel.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_shortcut_channel_foreground.xml b/app/src/main/res/drawable/ic_shortcut_channel_foreground.xml
index 3c431df0dc89321f18bbee86c2f47c2d38d38060..bc861c4115ce8c165cbdc550e62c4a2c254aeacf 100644
--- a/app/src/main/res/drawable/ic_shortcut_channel_foreground.xml
+++ b/app/src/main/res/drawable/ic_shortcut_channel_foreground.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_shortcut_query.xml b/app/src/main/res/drawable/ic_shortcut_query.xml
index e3ba8e9bd058176653a2b2a4763730b89ebd0b09..b5cb162782b656641872bbd382f85df25e3d0954 100644
--- a/app/src/main/res/drawable/ic_shortcut_query.xml
+++ b/app/src/main/res/drawable/ic_shortcut_query.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_shortcut_query_foreground.xml b/app/src/main/res/drawable/ic_shortcut_query_foreground.xml
index c73f379fb5b230fb668c96c354770a86098d7526..59cde857f1194a2959a4032a7d4500fd505547b7 100644
--- a/app/src/main/res/drawable/ic_shortcut_query_foreground.xml
+++ b/app/src/main/res/drawable/ic_shortcut_query_foreground.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_status.xml b/app/src/main/res/drawable/ic_status.xml
index ced7fa14f42ece344d6209b433efdacc1474079d..46249a8a77917338fc062277a2eedc2df82535b5 100644
--- a/app/src/main/res/drawable/ic_status.xml
+++ b/app/src/main/res/drawable/ic_status.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_status_channel.xml b/app/src/main/res/drawable/ic_status_channel.xml
index 5eac15254b2c4de19b01e2280468f6551e4bc9bf..47240c71d11928e4e217d4896b0559d90ed26b2c 100644
--- a/app/src/main/res/drawable/ic_status_channel.xml
+++ b/app/src/main/res/drawable/ic_status_channel.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_status_channel_offline.xml b/app/src/main/res/drawable/ic_status_channel_offline.xml
index 1dc53676b78011e9fae21cf5017c4f9567cb1d33..5972b3105a83c233fa417c207b18b76cf0b704e0 100644
--- a/app/src/main/res/drawable/ic_status_channel_offline.xml
+++ b/app/src/main/res/drawable/ic_status_channel_offline.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_status_offline.xml b/app/src/main/res/drawable/ic_status_offline.xml
index ae18315b14beeda0e7cc78837849225133644350..e1f7b651e2aee9c69ad3971084546e33ec00fbfb 100644
--- a/app/src/main/res/drawable/ic_status_offline.xml
+++ b/app/src/main/res/drawable/ic_status_offline.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_tab.xml b/app/src/main/res/drawable/ic_tab.xml
index 5fb65c5443b7345adc21ff7badd2ffcdd5aa7bfd..631f1085bf51da6c598c5b9690eb1d896fe5323b 100644
--- a/app/src/main/res/drawable/ic_tab.xml
+++ b/app/src/main/res/drawable/ic_tab.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/drawable/ic_tag_text.xml b/app/src/main/res/drawable/ic_tag_text.xml
index 61ca92830caf99c020c8c4512d03c0f39c162498..d75f1c254a6cdea27a1c258e4640ff3ff5d1db55 100644
--- a/app/src/main/res/drawable/ic_tag_text.xml
+++ b/app/src/main/res/drawable/ic_tag_text.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-land/layout_main.xml b/app/src/main/res/layout-land/layout_main.xml
index dee3141e949957bfd81ec72cd8e91833dfa90657..70a67c82c46683e7d7bcb9c4728aa82c6f2001ba 100644
--- a/app/src/main/res/layout-land/layout_main.xml
+++ b/app/src/main/res/layout-land/layout_main.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
index ae0529138a4809ea985978b341f7dbf0ffa38f8c..26b0b6f9df6cfb452fe7e247dd3341caaea63f9d 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw600dp-land/layout_main.xml b/app/src/main/res/layout-sw600dp-land/layout_main.xml
index 9f86c2f286d78d0522056824c7affbfa3fa7a4ff..0cec90e49a3a3e9e3fc398808fc049adab7b2392 100644
--- a/app/src/main/res/layout-sw600dp-land/layout_main.xml
+++ b/app/src/main/res/layout-sw600dp-land/layout_main.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw600dp-land/setup_slide.xml b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
index 7dad7edaa457e4686d89fa76199275c2b75c9816..fef8322c34daa7a32c5dd37ce922f3eed0d6990b 100644
--- a/app/src/main/res/layout-sw600dp-land/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp-land/setup_slide.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml
index ae0529138a4809ea985978b341f7dbf0ffa38f8c..26b0b6f9df6cfb452fe7e247dd3341caaea63f9d 100644
--- a/app/src/main/res/layout-sw600dp/activity_setup.xml
+++ b/app/src/main/res/layout-sw600dp/activity_setup.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw600dp/setup_slide.xml b/app/src/main/res/layout-sw600dp/setup_slide.xml
index 1a3ec1d8d43e5769c9ac30224f0aff53dba5d0d6..80e05dae7bce63c6b695335e1f5e12541f1e4586 100644
--- a/app/src/main/res/layout-sw600dp/setup_slide.xml
+++ b/app/src/main/res/layout-sw600dp/setup_slide.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
index dabc1f962e19c39c9919029af50feed7945c0df8..02314862c5d3a1cf1005d3a549edd4ce7e7e9fa2 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml
index 48541df3d84a6a85da19bdd478a65f9a5021ce82..e9362ee433e514cad749eb3b6cf3746716399c51 100644
--- a/app/src/main/res/layout-sw720dp/activity_settings.xml
+++ b/app/src/main/res/layout-sw720dp/activity_settings.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index eedaf1fd6a55ed1b4a77e57d702cdded850572d0..ce44b25c09536dd3586e0c43f9a81db95806cbe6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2e8e5e10565e4d2211e41223366fdde5495b65cb..2b41b5c31c4fdb6c124ab0fba58050bf7aaabf81 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 023655440106dc177a014b774b00514f5b309cf0..76a1061732da1e39603bc441b68093359b87bd3a 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/dialog_colorchooser.xml b/app/src/main/res/layout/dialog_colorchooser.xml
index fc9b41103c570940a29e3aa7794e0bc42ee31a80..d49843416ed398e75aa77c89d8345cfc3cf0b0f2 100644
--- a/app/src/main/res/layout/dialog_colorchooser.xml
+++ b/app/src/main/res/layout/dialog_colorchooser.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/dialog_colorchooser_custom.xml b/app/src/main/res/layout/dialog_colorchooser_custom.xml
index 2861ac2b60889751954852da0aa05a8022de66e6..49c091535d93c63548445ca7134eab8c5c352b8b 100644
--- a/app/src/main/res/layout/dialog_colorchooser_custom.xml
+++ b/app/src/main/res/layout/dialog_colorchooser_custom.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/dialog_colorchooser_presets.xml b/app/src/main/res/layout/dialog_colorchooser_presets.xml
index 507b20766b215bc3b8a77ec927f4cac2f174a307..422e90d23c206cfa1cbfe1fbdd92fb31c5a3b580 100644
--- a/app/src/main/res/layout/dialog_colorchooser_presets.xml
+++ b/app/src/main/res/layout/dialog_colorchooser_presets.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <com.afollestad.materialdialogs.color.FillGridView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_chat_list.xml b/app/src/main/res/layout/fragment_chat_list.xml
index d807490508fb5c69ad09986d5b0b2d31b8a73e6c..d2b9e369d8c7acaaa611b4feec9f34ef3584b422 100644
--- a/app/src/main/res/layout/fragment_chat_list.xml
+++ b/app/src/main/res/layout/fragment_chat_list.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_chatline.xml b/app/src/main/res/layout/fragment_chatline.xml
index b25376f622dd36c62d5da2a3a9bc9a2232c14f1f..8c1b8f62b6cd39d18807b6d651fd1e00e12f0b7e 100644
--- a/app/src/main/res/layout/fragment_chatline.xml
+++ b/app/src/main/res/layout/fragment_chatline.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_info_channel.xml b/app/src/main/res/layout/fragment_info_channel.xml
index 8798e0eb5ab3f4f31c529aca05c8be770bfdaaa5..393e4ea18b1577fb6a9d1c03c7e0d9c5318c9e62 100644
--- a/app/src/main/res/layout/fragment_info_channel.xml
+++ b/app/src/main/res/layout/fragment_info_channel.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_info_user.xml b/app/src/main/res/layout/fragment_info_user.xml
index bd3a5a4b491498041d025997975819687ccbf367..6e2425fe1650f785a6a19f0685c25a8e4ec4cf90 100644
--- a/app/src/main/res/layout/fragment_info_user.xml
+++ b/app/src/main/res/layout/fragment_info_user.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 883480d2948de8d5f2a22a652254f97d1deed72e..dbfd332eb0d36699ebed0721118349afe324664d 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_nick_list.xml b/app/src/main/res/layout/fragment_nick_list.xml
index d7e44301ad88465bfe0247569411b15065c30a81..e5fc20fabb2f2813a0ee8411b19c3f4c6b44e8d6 100644
--- a/app/src/main/res/layout/fragment_nick_list.xml
+++ b/app/src/main/res/layout/fragment_nick_list.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <de.kuschku.quasseldroid.util.ui.DrawerRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_toolbar.xml b/app/src/main/res/layout/fragment_toolbar.xml
index e3c3a493ab5acde20c6f41dd36424ec16e330224..8911cbc1850dcff377a8e2847cd7e52b3f8af171 100644
--- a/app/src/main/res/layout/fragment_toolbar.xml
+++ b/app/src/main/res/layout/fragment_toolbar.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_topic.xml b/app/src/main/res/layout/fragment_topic.xml
index f6037d1bb221ae35ab9717b448dcc6b7d913e4db..b267501cd4a965f9707cfd43ace40faa03674f64 100644
--- a/app/src/main/res/layout/fragment_topic.xml
+++ b/app/src/main/res/layout/fragment_topic.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/layout_editor.xml b/app/src/main/res/layout/layout_editor.xml
index 7737c050a291f826c5d5392cec7843f5458bfc26..df8f4902f7f61b586acf847e770ae6b68dec8237 100644
--- a/app/src/main/res/layout/layout_editor.xml
+++ b/app/src/main/res/layout/layout_editor.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/layout_history.xml b/app/src/main/res/layout/layout_history.xml
index f1599ed2f4af0f80983e7120b82284cafd906061..407d2d0ee6e4623386c53675eaacb1fb05fff714 100644
--- a/app/src/main/res/layout/layout_history.xml
+++ b/app/src/main/res/layout/layout_history.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index c194e5e90a35b5df6e3974f1f02cd2b9ff629d4e..540cc207a760c11c62be0690393cd0c7f545fe7b 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/layout_toolbar.xml b/app/src/main/res/layout/layout_toolbar.xml
index 4fc6d26cb2828fdbeaa0580d57fabf3a66062219..535f9fb86a8342c63ae619bac4d705a21ba43e8b 100644
--- a/app/src/main/res/layout/layout_toolbar.xml
+++ b/app/src/main/res/layout/layout_toolbar.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preference_vertical.xml b/app/src/main/res/layout/preference_vertical.xml
index 168e85f9ddfcca1f732bd9b5c86b62b7841184f8..5f4dd34124a4e117e65386ebb9dbce7c7932d2f3 100644
--- a/app/src/main/res/layout/preference_vertical.xml
+++ b/app/src/main/res/layout/preference_vertical.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_about.xml b/app/src/main/res/layout/preferences_about.xml
index 47721fb7f821314d88729a3fd992c0ae58d458b2..a4b5e42f60b56e02a39fbee68629425924e69336 100644
--- a/app/src/main/res/layout/preferences_about.xml
+++ b/app/src/main/res/layout/preferences_about.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_about_header.xml b/app/src/main/res/layout/preferences_about_header.xml
index b70905038a1478bfa2473bd466a8b410b7db37a9..238dcc230166851e20d2644fb8fc3b887b7b9603 100644
--- a/app/src/main/res/layout/preferences_about_header.xml
+++ b/app/src/main/res/layout/preferences_about_header.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -87,13 +87,6 @@
       android:layout_height="wrap_content"
       android:text="@string/label_github" />
 
-    <Button
-      android:id="@+id/action_privacy_policy"
-      style="@style/Widget.Button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/label_privacy_policy" />
-
   </android.support.v7.widget.ButtonBarLayout>
 
   <TextView
@@ -105,4 +98,11 @@
     android:text="@string/app_description_long"
     android:textAlignment="gravity" />
 
+  <Button
+    android:id="@+id/action_privacy_policy"
+    style="@style/Widget.Button.Borderless.Colored"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/label_privacy_policy" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/preferences_crash.xml b/app/src/main/res/layout/preferences_crash.xml
index 49be7347a351daf58db0181d848f5f4b3e52eb24..c84926ce74c0623e11d296d6880599368e7fb283 100644
--- a/app/src/main/res/layout/preferences_crash.xml
+++ b/app/src/main/res/layout/preferences_crash.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_license.xml b/app/src/main/res/layout/preferences_license.xml
index 1587fc1d38bcc9a75720e0975db714e8c7a4ea73..5f549cb969dbf99fe8ff65fe49b07681810bb5ab 100644
--- a/app/src/main/res/layout/preferences_license.xml
+++ b/app/src/main/res/layout/preferences_license.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_whitelist.xml b/app/src/main/res/layout/preferences_whitelist.xml
index 59ed70770efe999d572fea1f25e4ff789d464c8a..98d1a4537011b397194c5c95b015c7a9a5ddb3ab 100644
--- a/app/src/main/res/layout/preferences_whitelist.xml
+++ b/app/src/main/res/layout/preferences_whitelist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_whitelist_certificate_item.xml b/app/src/main/res/layout/preferences_whitelist_certificate_item.xml
index c8669f6132357e6df375b09d9b7cae97954bf654..10f1f94d92f6150c551aa4ad5a786e1df252f965 100644
--- a/app/src/main/res/layout/preferences_whitelist_certificate_item.xml
+++ b/app/src/main/res/layout/preferences_whitelist_certificate_item.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/preferences_whitelist_hostname_item.xml b/app/src/main/res/layout/preferences_whitelist_hostname_item.xml
index e2260a3121eaf9c4f9517977c05d631635cee1f0..191b4e34f752459b918ccf804de4b570e4725187 100644
--- a/app/src/main/res/layout/preferences_whitelist_hostname_item.xml
+++ b/app/src/main/res/layout/preferences_whitelist_hostname_item.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_aliasitem.xml b/app/src/main/res/layout/settings_aliasitem.xml
index 8dcf3a19c172dafc1b517468c9a65946017be997..3ac69e93b05cd596849c1d14ce4ab600e3bd30bc 100644
--- a/app/src/main/res/layout/settings_aliasitem.xml
+++ b/app/src/main/res/layout/settings_aliasitem.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_aliaslist.xml b/app/src/main/res/layout/settings_aliaslist.xml
index 2972ea2580f45db4665e2b2d58f48d916ef60a24..d57a1dbda137d66c771049b1d64527cd50a8f8a3 100644
--- a/app/src/main/res/layout/settings_aliaslist.xml
+++ b/app/src/main/res/layout/settings_aliaslist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_aliaslist_item.xml b/app/src/main/res/layout/settings_aliaslist_item.xml
index 7abe2c2862a8fe02df0d1ba03df87db2ba86dafa..b00a5a66a2b25554d4a3dcc0d6eb54f2d41663d4 100644
--- a/app/src/main/res/layout/settings_aliaslist_item.xml
+++ b/app/src/main/res/layout/settings_aliaslist_item.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_chatlist.xml b/app/src/main/res/layout/settings_chatlist.xml
index 58240d82298c6ba7c4cbc9acdc8993f1069986bf..796d1362ae3c4fc4a6b5d1ab6214c295dbb8d296 100644
--- a/app/src/main/res/layout/settings_chatlist.xml
+++ b/app/src/main/res/layout/settings_chatlist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_highlightlist.xml b/app/src/main/res/layout/settings_highlightlist.xml
index 2980d17cc7c2b302b900367ac11f33ff7f387c49..b1c13b861b2f5d0c6e01e486188da8b516bc1a9f 100644
--- a/app/src/main/res/layout/settings_highlightlist.xml
+++ b/app/src/main/res/layout/settings_highlightlist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_highlightlist_rule.xml b/app/src/main/res/layout/settings_highlightlist_rule.xml
index 5df1896b0e808af7c92251f60ab0bfa25de68615..cc6d0d6b55f5358e0575705e016ffb95b52551e6 100644
--- a/app/src/main/res/layout/settings_highlightlist_rule.xml
+++ b/app/src/main/res/layout/settings_highlightlist_rule.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_highlightrule.xml b/app/src/main/res/layout/settings_highlightrule.xml
index f4660fa546dfe5c190f66bda1119652564b7bdb4..61e536c56334b80341e835b241eb16f720dccd7c 100644
--- a/app/src/main/res/layout/settings_highlightrule.xml
+++ b/app/src/main/res/layout/settings_highlightrule.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_identity.xml b/app/src/main/res/layout/settings_identity.xml
index 21a523947a08fcefea1a6faf0793a57a785855f5..11fedd7de5a355c51fe678f669843c2c61e429e9 100644
--- a/app/src/main/res/layout/settings_identity.xml
+++ b/app/src/main/res/layout/settings_identity.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_identity_nick.xml b/app/src/main/res/layout/settings_identity_nick.xml
index 3333ea9ad127900bb3757b5691a6b75c30df05ad..ad7b7708c6df99a537522072028507c32a295ff8 100644
--- a/app/src/main/res/layout/settings_identity_nick.xml
+++ b/app/src/main/res/layout/settings_identity_nick.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_ignoreitem.xml b/app/src/main/res/layout/settings_ignoreitem.xml
index 954406dffd0b8120445f05e298b8e0da68cab98e..fe97aa605e1d5d7f2ba3833c6df955263f85e6d2 100644
--- a/app/src/main/res/layout/settings_ignoreitem.xml
+++ b/app/src/main/res/layout/settings_ignoreitem.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_ignorelist.xml b/app/src/main/res/layout/settings_ignorelist.xml
index 0baf1023ac638370328ab88499503a03847bf578..732689442b68f1c24278918b8f3552bf27d4b94f 100644
--- a/app/src/main/res/layout/settings_ignorelist.xml
+++ b/app/src/main/res/layout/settings_ignorelist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_ignorelist_item.xml b/app/src/main/res/layout/settings_ignorelist_item.xml
index c5c5c1babc42e68e5eba79b2bf123b0a39dcbfb4..338115d68265500e3f3f268c0f99bec6aa785940 100644
--- a/app/src/main/res/layout/settings_ignorelist_item.xml
+++ b/app/src/main/res/layout/settings_ignorelist_item.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_item.xml b/app/src/main/res/layout/settings_item.xml
index fef706556f9f80484a5333a2ba88dc76c080246b..bda4183bd8ec5e2d7b061b50633178b226891ad1 100644
--- a/app/src/main/res/layout/settings_item.xml
+++ b/app/src/main/res/layout/settings_item.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_list.xml b/app/src/main/res/layout/settings_list.xml
index f552c4517ac2e77380a09a9aeb88eb4f8d8e889b..d5afa20104eb9b299767114a4b901c6c47243708 100644
--- a/app/src/main/res/layout/settings_list.xml
+++ b/app/src/main/res/layout/settings_list.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml
index 13ace9794278210997125f904923be9e6e3c68a0..f46bb7459d190364bb37d2d96d60f3a94b662dcf 100644
--- a/app/src/main/res/layout/settings_network.xml
+++ b/app/src/main/res/layout/settings_network.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_network_server.xml b/app/src/main/res/layout/settings_network_server.xml
index 6d03d5d9b0ee13a1ca4c92591c9958972d1288d8..fd82422c55170553f4bda05686e81deb0c3b9d68 100644
--- a/app/src/main/res/layout/settings_network_server.xml
+++ b/app/src/main/res/layout/settings_network_server.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_networkconfig.xml b/app/src/main/res/layout/settings_networkconfig.xml
index f9e4eae6496eeae2dbf077bfb3cfcaf2ff77ce4f..73d335825f7bdeb597e0c505e53593511d0d4ada 100644
--- a/app/src/main/res/layout/settings_networkconfig.xml
+++ b/app/src/main/res/layout/settings_networkconfig.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/settings_networkserver.xml b/app/src/main/res/layout/settings_networkserver.xml
index 844323946f58346e12f4c0ec668d317182bc9783..1446afa4891c9cc4df15c8671bca8ff7532996f3 100644
--- a/app/src/main/res/layout/settings_networkserver.xml
+++ b/app/src/main/res/layout/settings_networkserver.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_account_connection.xml b/app/src/main/res/layout/setup_account_connection.xml
index f5b3785a97fd130b76c1ffcb91b2d13c4925cece..2ef9c2fed8c529548bab5a19598859eb39f927f8 100644
--- a/app/src/main/res/layout/setup_account_connection.xml
+++ b/app/src/main/res/layout/setup_account_connection.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index ae0cc91106a1ddc4eb90c435802a9287e318518b..93fbc1b94ba2fb4c51b76a51015d61c892df2c81 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_account_name.xml b/app/src/main/res/layout/setup_account_name.xml
index 1b34e2ec85faa7613cb92839251ffa27dd65c8f5..267b1971205a0f56fbc57bff4e46cde976393154 100644
--- a/app/src/main/res/layout/setup_account_name.xml
+++ b/app/src/main/res/layout/setup_account_name.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_account_user.xml b/app/src/main/res/layout/setup_account_user.xml
index e2f79cba4d51036c60c57b96573d92d1dcb9c937..ec629faab29dac59415bca20c7b3c87926689bce 100644
--- a/app/src/main/res/layout/setup_account_user.xml
+++ b/app/src/main/res/layout/setup_account_user.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_select_account.xml b/app/src/main/res/layout/setup_select_account.xml
index 8263d9d80ea261d1ad56a8b2faf08cba0c7776d5..f96251c49bc7b15e89a6f317ad92d1fd7268c140 100644
--- a/app/src/main/res/layout/setup_select_account.xml
+++ b/app/src/main/res/layout/setup_select_account.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/setup_slide.xml b/app/src/main/res/layout/setup_slide.xml
index 78761f95adc39f097f3421224838accf4b231cd4..16fb78bbc3f51cb8fc1444ebcac3105bed78b028 100644
--- a/app/src/main/res/layout/setup_slide.xml
+++ b/app/src/main/res/layout/setup_slide.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_buffer.xml b/app/src/main/res/layout/widget_buffer.xml
index 248e2714c9188caf37ecde30033d91c11d743158..1b9510451df323435ef1c2c1e0e3ed8574b09ec1 100644
--- a/app/src/main/res/layout/widget_buffer.xml
+++ b/app/src/main/res/layout/widget_buffer.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -67,6 +67,6 @@
       android:singleLine="true"
       android:textColor="?attr/colorTextSecondary"
       android:textSize="12sp"
-      tools:text="QuasselDroid is an Android client for #quassel ♥ justJanne's much improved version: https://dl.kuschku.de/releases/quasseldroid/ ♥ http://github.com/sandsmark/QuasselDroid ♥ Quasseldroid  on play  https://market.android.com/details?id=com.iskrembilen.quasseldroid ♥ Sign up for beta: https://plus.google.com/communities/104094956084217666662" />
+      tools:text="Quasseldroid is an Android client for #quassel ♥ justJanne's much improved version: https://dl.kuschku.de/releases/quasseldroid/ ♥ http://github.com/sandsmark/Quasseldroid ♥ Quasseldroid  on play  https://market.android.com/details?id=com.iskrembilen.quasseldroid ♥ Sign up for beta: https://plus.google.com/communities/104094956084217666662" />
   </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index ca9f082fb6fd6bc14e34b2b2d8caf05888927a9d..e09238aff1c0af3fac4ff82a7a0c8e835b9436aa 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_daychange.xml b/app/src/main/res/layout/widget_chatmessage_daychange.xml
index 4b45beb1fcbad4c1d96c7d313f2df56d56348462..44961aa11dea6602f88d7a4410cd3efee1d0a78e 100644
--- a/app/src/main/res/layout/widget_chatmessage_daychange.xml
+++ b/app/src/main/res/layout/widget_chatmessage_daychange.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index e3aab8e293dd1233a322d323ae9a5c27f972d136..d5246682cc2ca7091c9c0a4b381c368d45726239 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index 1a6e99d50b53dd85c9fa1b514f15de7aa02efb61..184305f9ad82e1ae617d6fdafaa7a94523077ca4 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index 8bc59ee9dcff0fecc5bb07c24729da21836dc8f7..2f99697ea015abe8bf8b3ba3156d7f76d4dc3310 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_placeholder.xml b/app/src/main/res/layout/widget_chatmessage_placeholder.xml
index fd2e42c2ad4dd9567f9962631021f24e3542355c..40462bc993bebcf66f07d2552d20b07aad6b429c 100644
--- a/app/src/main/res/layout/widget_chatmessage_placeholder.xml
+++ b/app/src/main/res/layout/widget_chatmessage_placeholder.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <View xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index e65d8425d24f98b741a95dc2f03e3e247ba8c709..10ef7f52e3426e45a26b284d6620b1895d114dcb 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index 8e042a5137855c9a6c965bd05166ecd886842df0..607c7783574a26bb8af01e08048a5d53d0f7a06a 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_contributor.xml b/app/src/main/res/layout/widget_contributor.xml
index 7fbff600a20f24b5b49861bc67d1932766c0f92d..806795bf9289140dc4a22fcd50c649a4b10b3662 100644
--- a/app/src/main/res/layout/widget_contributor.xml
+++ b/app/src/main/res/layout/widget_contributor.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_core_account.xml b/app/src/main/res/layout/widget_core_account.xml
index 2f5838f1fcf5849a607bba3081b8627614de1b11..d2c9f6b000b08d2ee80b7fc76b263aabeac7f633 100644
--- a/app/src/main/res/layout/widget_core_account.xml
+++ b/app/src/main/res/layout/widget_core_account.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_core_account_add.xml b/app/src/main/res/layout/widget_core_account_add.xml
index e95fd0be17a48dca4a9f999829fb3c4705993dab..c4c2768d77c53e5545a67d0fb02da575ddaddd03 100644
--- a/app/src/main/res/layout/widget_core_account_add.xml
+++ b/app/src/main/res/layout/widget_core_account_add.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_crash.xml b/app/src/main/res/layout/widget_crash.xml
index 6dc0c07e9e4f611abecdc3ec4a9036c40a144932..128ac85c8e4ab37e1a36c7d2adf3c9c56779762e 100644
--- a/app/src/main/res/layout/widget_crash.xml
+++ b/app/src/main/res/layout/widget_crash.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_formatting.xml b/app/src/main/res/layout/widget_formatting.xml
index 0d383461f84ad87cc463484fcc39f98a1897b8f1..39a6c9984664231cc0a7087db0e4180567e7a272 100644
--- a/app/src/main/res/layout/widget_formatting.xml
+++ b/app/src/main/res/layout/widget_formatting.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_history_message.xml b/app/src/main/res/layout/widget_history_message.xml
index 35e8ba3547f43e6fffd048264198c4fbf72bc7c2..6b28d5c8df47ec6b9ddc00f73557b490fa077392 100644
--- a/app/src/main/res/layout/widget_history_message.xml
+++ b/app/src/main/res/layout/widget_history_message.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_library.xml b/app/src/main/res/layout/widget_library.xml
index eea2e10aa439b700a9333428426caaca2082a29b..b93cc4c00a6ab786f74e8986daab29f7bf2ed5d3 100644
--- a/app/src/main/res/layout/widget_library.xml
+++ b/app/src/main/res/layout/widget_library.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_network.xml b/app/src/main/res/layout/widget_network.xml
index 207c998c81e7994800d6c0ab07acc977cf7b0147..189d53d83ef82ad3f20bb9e29ea6291d573794b3 100644
--- a/app/src/main/res/layout/widget_network.xml
+++ b/app/src/main/res/layout/widget_network.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_nick.xml b/app/src/main/res/layout/widget_nick.xml
index 3e923820825e05bd76e550030394a9498075763c..c226c0fec5647572285661c1dc61a6d6425916fb 100644
--- a/app/src/main/res/layout/widget_nick.xml
+++ b/app/src/main/res/layout/widget_nick.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_nick_away.xml b/app/src/main/res/layout/widget_nick_away.xml
index ac3532daa066de69e88c81fdcd8b156b856de3e0..7f973b99836c504a620e3002634ea70fbecd2179 100644
--- a/app/src/main/res/layout/widget_nick_away.xml
+++ b/app/src/main/res/layout/widget_nick_away.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_spinner_item_inline.xml b/app/src/main/res/layout/widget_spinner_item_inline.xml
index 623d470adc14df6292a990a6b9c452f0f921acd0..0a34546b66bff1dbb32454a5c7fb19253e973a2b 100644
--- a/app/src/main/res/layout/widget_spinner_item_inline.xml
+++ b/app/src/main/res/layout/widget_spinner_item_inline.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/widget_spinner_item_toolbar.xml b/app/src/main/res/layout/widget_spinner_item_toolbar.xml
index 0506fcf5ab436fe405e888f8d1217ec461786014..37ed05d23917dad2f349d36cba46eff0dd8fbaea 100644
--- a/app/src/main/res/layout/widget_spinner_item_toolbar.xml
+++ b/app/src/main/res/layout/widget_spinner_item_toolbar.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/menu/activity_crashes.xml b/app/src/main/res/menu/activity_crashes.xml
index 78ff28c6ce26138fa9d018a9dc3068a6410b2f7b..f85cfd7517620fc462dce55f510df0f59f45669d 100644
--- a/app/src/main/res/menu/activity_crashes.xml
+++ b/app/src/main/res/menu/activity_crashes.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml
index 7ab2e35a36f0bb1fbb72a6c611dbd34b7618eab6..100bf3583ed294998691e4b735fd48862c3b8d6d 100644
--- a/app/src/main/res/menu/activity_main.xml
+++ b/app/src/main/res/menu/activity_main.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/menu/activity_settings.xml b/app/src/main/res/menu/activity_settings.xml
index d2abd81074b76dcff58263f54c0139b00b50c0b5..9a37bb872034e6475d1ba5addaed9bdf9b7d0a99 100644
--- a/app/src/main/res/menu/activity_settings.xml
+++ b/app/src/main/res/menu/activity_settings.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/activity_setup.xml b/app/src/main/res/menu/activity_setup.xml
index 2ed292fa4712e6144600fb90cfd7a85186d82ae0..53ebae5bb37aeade46e3ca4cd78318e902c01439 100644
--- a/app/src/main/res/menu/activity_setup.xml
+++ b/app/src/main/res/menu/activity_setup.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/context_buffer.xml b/app/src/main/res/menu/context_buffer.xml
index a75731b7f687eb12985d7d5403926c9706137cd6..e85ca1134140c2971dd38fb95388ac7c7001f37d 100644
--- a/app/src/main/res/menu/context_buffer.xml
+++ b/app/src/main/res/menu/context_buffer.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/menu/context_bufferlist.xml b/app/src/main/res/menu/context_bufferlist.xml
index 9354ad0178d063eaad1cc16bd1c97cc5b48ee5fe..fc02c4eca11e5ab60545a5b0aa31132850ed8db8 100644
--- a/app/src/main/res/menu/context_bufferlist.xml
+++ b/app/src/main/res/menu/context_bufferlist.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/context_link.xml b/app/src/main/res/menu/context_link.xml
index 27e4c251b2af438cf140a837357fff7ea25de8cd..e47a14c36928605fe0b83a07af1e892fb675ce39 100644
--- a/app/src/main/res/menu/context_link.xml
+++ b/app/src/main/res/menu/context_link.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/context_messages.xml b/app/src/main/res/menu/context_messages.xml
index 27e4c251b2af438cf140a837357fff7ea25de8cd..e47a14c36928605fe0b83a07af1e892fb675ce39 100644
--- a/app/src/main/res/menu/context_messages.xml
+++ b/app/src/main/res/menu/context_messages.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/menu/context_setting.xml b/app/src/main/res/menu/context_setting.xml
index eb3a80d6029255239d4ac0b255081f5b58d6c53c..1abb190cdb07f8486e1066b97f4949d95e2726a3 100644
--- a/app/src/main/res/menu/context_setting.xml
+++ b/app/src/main/res/menu/context_setting.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/menu/editor.xml b/app/src/main/res/menu/editor.xml
index 185ff76670fff4bd78e0fb5caf9ebc3ac5be013d..a3a2dbcc9eec5827f6cd698d7cd3ce8b35efb45f 100644
--- a/app/src/main/res/menu/editor.xml
+++ b/app/src/main/res/menu/editor.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/menu/setup_edit_account.xml b/app/src/main/res/menu/setup_edit_account.xml
index 759ea07e71dadcb80c6843c10c74558676416edb..9e235c12e4e8a086895a8f24db1555d2800dc5a6 100644
--- a/app/src/main/res/menu/setup_edit_account.xml
+++ b/app/src/main/res/menu/setup_edit_account.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 04094426efa71add5dcf077444a244388fa4992d..d2e3d7bc7963dad3136dbbe2520d381b1f400431 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/raw/keep.xml b/app/src/main/res/raw/keep.xml
index c7cf7ca8af06ae11a1c13009c44a58235b127c50..7a79152e52b94eee49b256ba3e2303e933e5fc0a 100644
--- a/app/src/main/res/raw/keep.xml
+++ b/app/src/main/res/raw/keep.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dba39439150c6868169b12aafa8e63908e2d78e0..eb6eec6d63025da2f1b4a82e6080bbf70d46423a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
-  <string name="app_name">QuasselDroid</string>
+  <string name="app_name">Quasseldroid</string>
   <string name="app_description">Ein Android-Client für das dezentralen Quassel IRC Client.</string>
-  <string name="app_description_long">Quassel ist ein dezentraler IRC client, entwickelt in C++ mit Qt. QuasselDroid ist ein Java-basierter Client für den Quassel Core, der es ermöglicht, Quassel auch auf Android™-Telefonen zu nutzen.</string>
+  <string name="app_description_long">Quassel ist ein dezentraler IRC client, entwickelt in C++ mit Qt. Quasseldroid ist ein Kotlin-basierter Client für den Quassel Core, der es ermöglicht, Quassel auch auf Android™-Telefonen zu nutzen.</string>
 
   <string name="connection_service_title">Verbindungsdienst</string>
   <string name="connection_service_description">Hält eine Verbindung zum Core, um Benachrichtigungen und die Übertragung von Nachrichten zu ermöglichen</string>
diff --git a/app/src/main/res/values-de/strings_contributors.xml b/app/src/main/res/values-de/strings_contributors.xml
index 6a0b8922c39aab49d79aac575f98c8f400851a39..2bb55e25319d0c872b5bcc6dcb8321f558e938c8 100644
--- a/app/src/main/res/values-de/strings_contributors.xml
+++ b/app/src/main/res/values-de/strings_contributors.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_error.xml b/app/src/main/res/values-de/strings_error.xml
index 28c5659f3b1536717384a55054850722a7aa6d5e..50da8e4f28dbc9667b508c03f95a63f57756561d 100644
--- a/app/src/main/res/values-de/strings_error.xml
+++ b/app/src/main/res/values-de/strings_error.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_format.xml b/app/src/main/res/values-de/strings_format.xml
index 2627d303fbd96e0c5b5751630afc8d80e7999971..51a11cb9e48166ef44386aa1fa4cd46015b710f0 100644
--- a/app/src/main/res/values-de/strings_format.xml
+++ b/app/src/main/res/values-de/strings_format.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_info.xml b/app/src/main/res/values-de/strings_info.xml
index 9b89bc0ab493099a17739e3e25f7a4f48a5ccc53..94aa50d9dc807cb872ef4d7ad145215842d44459 100644
--- a/app/src/main/res/values-de/strings_info.xml
+++ b/app/src/main/res/values-de/strings_info.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_messages.xml b/app/src/main/res/values-de/strings_messages.xml
index 7f8fb2392ec217a9babcfa71107b2f3fd4d924f7..f4835b759eb3451c14f1b923f7e3c7dd773f79bb 100644
--- a/app/src/main/res/values-de/strings_messages.xml
+++ b/app/src/main/res/values-de/strings_messages.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index 1f6893d483def162f233fc25ba4bb8a5e7ff8cd5..889e899863a4cfea3e5c832f4fd21a0a9fb6161f 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
@@ -123,5 +123,5 @@
   <string name="preference_connection_title">Verbindung</string>
 
   <string name="preference_show_notification_title">Benachrichtigung anzeigen</string>
-  <string name="preference_show_notification_summary">Zeigt eine permanente Benachrichtigung an, damit QuasselDroid durchgehend verbunden bleiben kann</string>
+  <string name="preference_show_notification_summary">Zeigt eine permanente Benachrichtigung an, damit Quasseldroid durchgehend verbunden bleiben kann</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings_settings.xml b/app/src/main/res/values-de/strings_settings.xml
index b95e2884086a6acbafd80b2754f8e0805025535d..d27444f69c3aa438ac881510283c9e1b6dad13cd 100644
--- a/app/src/main/res/values-de/strings_settings.xml
+++ b/app/src/main/res/values-de/strings_settings.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_setup.xml b/app/src/main/res/values-de/strings_setup.xml
index 071a8ef3d36932f8aa8ecb498deaf9b57f260005..8357aaa113277beeafb28b4823c3f9bf622164b9 100644
--- a/app/src/main/res/values-de/strings_setup.xml
+++ b/app/src/main/res/values-de/strings_setup.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-de/strings_status.xml b/app/src/main/res/values-de/strings_status.xml
index 76acf8c3f2f8cde3fba9cc80f536eaeea52fcdb8..bff6336b18c74803cb135d3db31526d8b64bd431 100644
--- a/app/src/main/res/values-de/strings_status.xml
+++ b/app/src/main/res/values-de/strings_status.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
index af065dfd2170d2ffb9e59d458647d41303bda619..9a2bd8fecac9943a296aababe1f1e5925b3b5ed2 100644
--- a/app/src/main/res/values-large/dimens.xml
+++ b/app/src/main/res/values-large/dimens.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 0daddffad7cc110ffe0c0da99eae8c54ef515f16..907b4ed7933450deb4a569fd5b11181fbb243ccf 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-sw600dp/themes_base.xml b/app/src/main/res/values-sw600dp/themes_base.xml
index a8625bb0bdd557d034f48f692e8d1f14d24f1231..b80896e2b7c6dd7fa3abab5582a7a5da15096f79 100644
--- a/app/src/main/res/values-sw600dp/themes_base.xml
+++ b/app/src/main/res/values-sw600dp/themes_base.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-sw720dp-land/bools.xml b/app/src/main/res/values-sw720dp-land/bools.xml
index f560c812e7a7d42ebd632c95181a09b379bdaffa..add5b719903195672c1c45385215d8842317d27a 100644
--- a/app/src/main/res/values-sw720dp-land/bools.xml
+++ b/app/src/main/res/values-sw720dp-land/bools.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-v17/styles_widgets.xml b/app/src/main/res/values-v17/styles_widgets.xml
index a6aa7eb803e22b534ddc99149b3871141c420c9f..1d038d56ef1c41b88e06ac2cb0874f091b88897c 100644
--- a/app/src/main/res/values-v17/styles_widgets.xml
+++ b/app/src/main/res/values-v17/styles_widgets.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values-v21/themes_base.xml b/app/src/main/res/values-v21/themes_base.xml
index 1aa30e4562485207460377cc2aa211f7633f844d..d99781e857fdf4c60d16a60c775f8a49a8705ca4 100644
--- a/app/src/main/res/values-v21/themes_base.xml
+++ b/app/src/main/res/values-v21/themes_base.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8959f4e9a0416ef388f5951a1adc1a0288565a93..69aeb9d267b3c9f480e7704fe9757102c40329bb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 05feae896e7297749416e569a1a08e8f947ab733..1bec319b0be4261408c09057d78283f9c30a996b 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1e3fc9033d301de9192ab03ee21789b9a47cb9f6..58bf27b77dddaf113a7a9613bd668a55d35d8412 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/defaults.xml b/app/src/main/res/values/defaults.xml
index f491bbd9c1b1d6dd1262f6406e10a800be5131aa..6248de263f4bc4a341a3e3e1373c54517c8a5401 100644
--- a/app/src/main/res/values/defaults.xml
+++ b/app/src/main/res/values/defaults.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e87f49eca4bbb6ee1fd23cb8be36e6454deef1cd..7bb53ff86389c18c044e5c65a9deea5209422dfe 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 7535bcb7c5d53e4f732f555274e6e7ec7ab381e7..46d5f6eb02ac4a60245005aaeb022d06b6ad1476 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3eb7b6021c2efcb2c615a12b9f23b064c833c939..107b98d3f2cb22bb5af50cef2464019162e05812 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
-  <string name="app_name">QuasselDroid</string>
+  <string name="app_name">Quasseldroid</string>
   <string name="app_description">An Android-based client for the decentralized Quassel IRC client.</string>
-  <string name="app_description_long">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. QuasselDroid is a pure-java client for the Quassel core, allowing you to connect to your Quassel core using your Android (TM) phone.</string>
+  <string name="app_description_long">Quassel is a distributed, decentralized IRC client, written using C++ and Qt. Quasseldroid is a pure-kotlin client for the Quassel core, allowing you to connect to your Quassel core using your Android™ phone.</string>
 
   <string name="connection_service_title">Connection Service</string>
   <string name="connection_service_description">Keeps a connection to your core to allow for notifications, and to transmit messages.</string>
diff --git a/app/src/main/res/values/strings_contributors.xml b/app/src/main/res/values/strings_contributors.xml
index 2880d85737298b02a8d527bf5bcd16c11026ce18..cf08194ee0634057b264130b4e297caa331585a2 100644
--- a/app/src/main/res/values/strings_contributors.xml
+++ b/app/src/main/res/values/strings_contributors.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_error.xml b/app/src/main/res/values/strings_error.xml
index 8b3291d7013277fcecbbdb7717089e57eb5619b9..d14ab39eb1c806eefff0c6a02f7e0450888ad51a 100644
--- a/app/src/main/res/values/strings_error.xml
+++ b/app/src/main/res/values/strings_error.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_format.xml b/app/src/main/res/values/strings_format.xml
index 7ed8ee948bf62d08c8184062de1108a3aae996bb..2e04d09b05b2061d6ed19052ec2878c850f496ea 100644
--- a/app/src/main/res/values/strings_format.xml
+++ b/app/src/main/res/values/strings_format.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_info.xml b/app/src/main/res/values/strings_info.xml
index 5269058bb84fd77bf8278265fcfcb02333f4ab75..052f19b83aedc94aa764d349bab9a850b1fc6c22 100644
--- a/app/src/main/res/values/strings_info.xml
+++ b/app/src/main/res/values/strings_info.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_licenses.xml b/app/src/main/res/values/strings_licenses.xml
index 114aa80c52cb3582c6dc38b8c75aefb57752e3a6..ecdd36f9af4957eb8c6ca123b6ef10be23cf767d 100644
--- a/app/src/main/res/values/strings_licenses.xml
+++ b/app/src/main/res/values/strings_licenses.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
diff --git a/app/src/main/res/values/strings_messages.xml b/app/src/main/res/values/strings_messages.xml
index 9fd606ae4b6a2ffd19bc5645e1cfa40be23fee38..6cac8bbaabf8e7334c04d84a001b7a5367561d14 100644
--- a/app/src/main/res/values/strings_messages.xml
+++ b/app/src/main/res/values/strings_messages.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index e3a930b56ff61d2f700aff79a5200040547e09bc..b22097270829d3a8856081c60f5fff89a7f81b5a 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
@@ -202,7 +202,7 @@
 
   <string name="preference_show_notification_key" translatable="false">show_notification</string>
   <string name="preference_show_notification_title">Show notification</string>
-  <string name="preference_show_notification_summary">Keeps QuasselDroid always connected by showing a persistent notification</string>
+  <string name="preference_show_notification_summary">Keeps Quasseldroid always connected by showing a persistent notification</string>
 
   <string name="preference_notification_id_key" translatable="false">notification_id</string>
 </resources>
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
index 564abf8ce36e111c697ae34fd3185e371243256b..4d3d6871851b5f816486dae4939946ae0024c68b 100644
--- a/app/src/main/res/values/strings_settings.xml
+++ b/app/src/main/res/values/strings_settings.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_setup.xml b/app/src/main/res/values/strings_setup.xml
index 7f87c721a2fb9568f0db40da31f1b6c5874915be..b7e485b9d5bba31eb7cb804207a504446b4a9c8e 100644
--- a/app/src/main/res/values/strings_setup.xml
+++ b/app/src/main/res/values/strings_setup.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/strings_status.xml b/app/src/main/res/values/strings_status.xml
index 0ca14c330ac796ad1bcb5b9a978c0da9aef58a91..c018a445524d06f6b95a9b2912aedc34b5895ae9 100644
--- a/app/src/main/res/values/strings_status.xml
+++ b/app/src/main/res/values/strings_status.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index e1d677c6cb3e63abf84846b77b0cae154494433c..9fab6a0ba454fd17304f6929e41a7c76183db024 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_amoled.xml b/app/src/main/res/values/themes_amoled.xml
index 06d5050a699981dbeb119950c5b686271d295a50..6d4600c672e6a6a8404df355017550e4ce9ef997 100644
--- a/app/src/main/res/values/themes_amoled.xml
+++ b/app/src/main/res/values/themes_amoled.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index f38391cf8115c87a56897ef2a6299d01e6f49a56..4b7973c1a3d388e7876a4f82cc194ec76a978d13 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -1,23 +1,23 @@
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_dracula.xml b/app/src/main/res/values/themes_dracula.xml
index 460b1263fa73d26429657b25c26cc3989ccd0051..c3afeb8a7da4d6e716b025214b2118400b1251bd 100644
--- a/app/src/main/res/values/themes_dracula.xml
+++ b/app/src/main/res/values/themes_dracula.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_gruvbox.xml b/app/src/main/res/values/themes_gruvbox.xml
index e695eb758875fe4e552a4de67ab59924c7c7a587..0cb1bbd9bc0ed53260c46cab99301cf280ebaaad 100644
--- a/app/src/main/res/values/themes_gruvbox.xml
+++ b/app/src/main/res/values/themes_gruvbox.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_material.xml b/app/src/main/res/values/themes_material.xml
index 2a4fe3c5f394b6b41d3e83b54b693f59e43b035f..67250dac4f761c091aac759a62199011f388d5aa 100644
--- a/app/src/main/res/values/themes_material.xml
+++ b/app/src/main/res/values/themes_material.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml
index 5f30e7ff3d7a491195c23b7eecff7b2ddf25ac38..86c5fc22c676f790d42668d80050f7f9eaccae71 100644
--- a/app/src/main/res/values/themes_quassel.xml
+++ b/app/src/main/res/values/themes_quassel.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 9c62749f9dc48c545bd0c3028f95ca008f33204b..33f89fb8e3706570afee6788bd4c5e5cede39eca 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <resources>
diff --git a/app/src/main/res/xml/backup_content.xml b/app/src/main/res/xml/backup_content.xml
index dde517c6cc486d7c278d6826f34f45facd87a0fb..3cb103d91bcff31daf66caafe621d35bf25bc972 100644
--- a/app/src/main/res/xml/backup_content.xml
+++ b/app/src/main/res/xml/backup_content.xml
@@ -1,4 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <full-backup-content>
   <include
     domain="sharedpref"
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4941f23ec47aee9f61bcbcfc918a17b07402a36d..92d3b93a6ff9095b98b1fcd07175c49e635c5e18 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt b/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
index dbc6a01dc85bf9314e058a07be468faa5b3ff21c..f186fa80f45be1bff3d6a70598f6e93dc9eaed2d 100644
--- a/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
+++ b/app/src/test/java/de/kuschku/quasseldroid/util/AvatarHelperTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/build.gradle b/build.gradle
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1be7f65b9ef655b0fe47f23b2e4e16731813248b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -0,0 +1,22 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 Ken Børge Viktil
+ * Copyright (c) 2018 Magnus Fjell
+ * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e2525c185f7e5ed1f99fb53e9e9b6b4c6be15365..b398428357f9e0cd708b4f97f77907855770f955 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/buildSrc/src/main/kotlin/ProjectHelper.kt b/buildSrc/src/main/kotlin/ProjectHelper.kt
index 6caf4ebf4ed1bedc44caec9dec3235b48fad5366..446c27284f141c55f037a72bebc046a396cf81d1 100644
--- a/buildSrc/src/main/kotlin/ProjectHelper.kt
+++ b/buildSrc/src/main/kotlin/ProjectHelper.kt
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/buildSrc/src/main/kotlin/VersionContext.kt b/buildSrc/src/main/kotlin/VersionContext.kt
index d9c3d2c8320612a04b0c59db4dcc135769910ace..ec11e5b73f5b70ffbf2da50e9d8b7ff7b15cb564 100644
--- a/buildSrc/src/main/kotlin/VersionContext.kt
+++ b/buildSrc/src/main/kotlin/VersionContext.kt
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gradle.properties b/gradle.properties
index fd51f17e9ea483469742289a1079533b9f242d39..0defa2db12193f9c1b06698573b54337d4e73c86 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,14 @@
-#
-# QuasselDroid - Quassel client for Android
+# Quasseldroid - Quassel client for Android
 #
 # Copyright (c) 2018 Janne Koschinski
 # Copyright (c) 2018 Ken Børge Viktil
 # Copyright (c) 2018 Magnus Fjell
 # Copyright (c) 2018 Martin Sandsmark
+# Copyright (c) 2018 The Quassel Project
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
+# under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +17,6 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
 
 # Project-wide Gradle settings.
 # IDE (e.g. Android Studio) users:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 91309ff2c89af4723d0a89a36a1f481f877ff63a..6cf7605dfa7d3a9717a6954a15011ac11cea3c09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,22 @@
+# Quasseldroid - Quassel client for Android
+#
+# Copyright (c) 2018 Janne Koschinski
+# Copyright (c) 2018 Ken Børge Viktil
+# Copyright (c) 2018 Magnus Fjell
+# Copyright (c) 2018 Martin Sandsmark
+# Copyright (c) 2018 The Quassel Project
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Slot.java b/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Slot.java
index 93356a399d26b7cdfe7b2d198f07efe9987f2af0..641d7b81f3df2baff171677e11ff24e292ebb16a 100644
--- a/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Slot.java
+++ b/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Slot.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Syncable.java b/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Syncable.java
index e95850f9e5c4f4e9a276763d8662101b33c3b25b..48e7ea26b75c4433857b6013cb8062197c14fa1c 100644
--- a/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Syncable.java
+++ b/invokerannotations/src/main/java/de/kuschku/libquassel/annotations/Syncable.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/invokergenerator/build.gradle.kts b/invokergenerator/build.gradle.kts
index a761d81c1d0e3e6e71f90d89a7f2e36d97d370ea..eb95066e9d37e5aa254edc8498e1bb6b052c71c2 100644
--- a/invokergenerator/build.gradle.kts
+++ b/invokergenerator/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java b/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
index b4b9fe8b4b1f474d23e440197271b057cea807b0..71e182159c0a4810bd5f833d740fc3a0d48fcda9 100644
--- a/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
+++ b/invokergenerator/src/main/java/de/kuschku/libquassel/annotations/InvokerProcessor.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 83d8f942990ba618a71e05097efe7e70b8ade499..adcbfa55b59411212c3bd5494c6ae190160ae8b6 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/ConnectionState.kt b/lib/src/main/java/de/kuschku/libquassel/connection/ConnectionState.kt
index 136fd1d7b07e04aa280fcaacc1ca2c9c6e41bb20..d2fc55f2c3e214d237ab5f0f810a2ed562cdf352 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/ConnectionState.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/ConnectionState.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt b/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt
index 070197ba53b1e655d4bc03285a7f60a09471b0a5..8cff1dfc68c06601999d2677ef431e20a72284ac 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/CoreConnection.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/Features.kt b/lib/src/main/java/de/kuschku/libquassel/connection/Features.kt
index b6972cc25a21d50d96bdac62e788c6a28ef343cc..963587651b7f9ab893e23a1a320d04f5fa47b6cf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/Features.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/Features.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/HostnameVerifier.kt b/lib/src/main/java/de/kuschku/libquassel/connection/HostnameVerifier.kt
index 5b2f876a508545f495cc770dd8dd8af2e36f3453..787e0c6d2f248704c4644f2d04806fe70589834a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/HostnameVerifier.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/HostnameVerifier.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/MessageRunnable.kt b/lib/src/main/java/de/kuschku/libquassel/connection/MessageRunnable.kt
index 16608dd81836e795a3fe9ff885ebe0d5c5d37f52..f3ea84686ed77d1bb9bed3792dc2bbb4563ac7c9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/MessageRunnable.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/MessageRunnable.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/QuasselSecurityException.kt b/lib/src/main/java/de/kuschku/libquassel/connection/QuasselSecurityException.kt
index eeadd382eb31f2813677e7f43fc5f24680cfbe63..0f4bf99b26fdda8cb6b34c40deb0f2f1452d9294 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/QuasselSecurityException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/QuasselSecurityException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/connection/SocketAddress.kt b/lib/src/main/java/de/kuschku/libquassel/connection/SocketAddress.kt
index 10a527ce1db968661a8c1937a271dca917a35dd6..da91c80583c6b2ed52fc26e8152b25d97cab8daf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/connection/SocketAddress.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/connection/SocketAddress.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/ClientData.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/ClientData.kt
index 47336ab39ca29ff2e5656c07936d297518e83893..de27e24ba567b742bc582b733c9161971c41a8f8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/ClientData.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/ClientData.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/Message.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/Message.kt
index c57025ba3e4b5452659de3d090af44f8ba4d2e8c..9e2c1951b2701449e5900ddd7f485b8262ccabd1 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/Message.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/Message.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/NetworkLayerProtocol.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/NetworkLayerProtocol.kt
index 110c1c279f642dd1519a4352ffc2abf490c459fd..952e58263776532523fe2a95cf42d9adc55f5fa5 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/NetworkLayerProtocol.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/NetworkLayerProtocol.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/Protocol.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/Protocol.kt
index df05b4af70fd2b9224402798d791a5430d699082..e6d138e8b3991acdab2f191aec52ab357be19e5f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/Protocol.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/Protocol.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/QType.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/QType.kt
index 899fa0ec4fb7ec5e91dd3dcad6e58a21909ea014..0329975e0859fafb7df1a53fea3886ca3fe92d2a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/QType.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/QType.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
index 9e5daf1543fa209021d5bcdc27d246306d2e561b..9a723e20a424404825bfce7bf0ea9ba95b155a9d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/QVariant.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/QVariant.kt
index aea4d73a58a6faf78298e83900b5c7cb4591e763..555b18f009c0113553a889f82898428eaa9b9f2d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/QVariant.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/QVariant.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/Type.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/Type.kt
index 6a11a6cae3eaecc62b5ee2d77d25a1533f19526b..06f3d228731b39f7c875740f5e1b485c78879bfe 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/Type.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/Type.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitAckSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitAckSerializer.kt
index 9764151e2e3fa1ae6d62c2b231a6ffbccdf17db7..42a5a73ddcc2a10942afdb0848d8c245ea12ce6f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitAckSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitAckSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitRejectSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitRejectSerializer.kt
index 905b1849bc56fb03d49cc7c5b35e49788aedb46f..edae6f7fa4f0c3b155d3d5767def6b06d773fe6e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitRejectSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitRejectSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitSerializer.kt
index 651688e525a8b1b25dc51d0b6c8f83f3e4c2db67..b2158154384c7d217f73479d75ae14263a3fc027 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientInitSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginAckSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginAckSerializer.kt
index 2bf5f98ebfc126c9646e3fab6a67cf81f1390955..f79ab3bab5f4525f427888fccb5a07661da36391 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginAckSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginAckSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginRejectSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginRejectSerializer.kt
index a4a6acf5088e8daaad6bb68162ecbac3879fa10b..c4d16b72d45926b878e908497159dee372b96c23 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginRejectSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginRejectSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginSerializer.kt
index 984cc4ee7070dcc147e00e54fb16e9491a7daddb..e27c9389b6cb683ff3231fbd2db1a3e6c0c18ac0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/ClientLoginSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupAckSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupAckSerializer.kt
index 71c8b3ecf2f19d96480980885fe6ea198dd1e131..587d80b575c781552ad35ddc066e2931bc0efa96 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupAckSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupAckSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupDataSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupDataSerializer.kt
index c652a6c55d46f6e3b970023644245e15e134e551..235433ed763cffc02451d1a8d7dba9eef8a8ae53 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupDataSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupDataSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupRejectSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupRejectSerializer.kt
index 2719907577142c3ba27a32ce19ab0e7254aaea0d..88483f73c0132f92cbac50ca3e28d6310c96da9c 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupRejectSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/CoreSetupRejectSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessage.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessage.kt
index 707fdba89107008ca60f452f8e3b254374b055ba..39dd5d8a1ddd88e2cb5d02a0670d206871608898 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessage.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessageSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessageSerializer.kt
index a66f59c501b6615af67602c16d80427e88e7fa20..a7a7ff36631067dd0339d8dbe3ec49234856d9fe 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessageSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HandshakeMessageSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatReplySerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatReplySerializer.kt
index 0afafb5b4e64b214fe39fea37b1e026fd08e358e..732c2b290a36b9fc0b4521184eca8611639ddc56 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatReplySerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatReplySerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatSerializer.kt
index d79f45e98c600ba5729c23bad919349e321741e8..4c25e4f4e08b82efa00dd135939455b7d8df3fe1 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/HeartBeatSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitDataSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitDataSerializer.kt
index a6ce842353464caeefd3d0f9e57ad75f61adbb81..6925eab77548220bad8af9835cc0bee69e71470e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitDataSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitDataSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitRequestSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitRequestSerializer.kt
index eaefb3619a36394879054d69185ceea062e64ee2..207ca99815be96c196ecd3b1a59761cf57336ec0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitRequestSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/InitRequestSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/RequestType.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/RequestType.kt
index bd0e391b9b5e49d75e6bafeceeb3cfc0c6f115e1..73353ab10bac32eb0ce55d9c8506ffa395be7fe9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/RequestType.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/RequestType.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/RpcCallSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/RpcCallSerializer.kt
index c13af05df93a393140b81f7f72b0448b8c4ff98d..b6cfa0d78f64d815a320f72d491124c2569223db 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/RpcCallSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/RpcCallSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SessionInitSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SessionInitSerializer.kt
index df0e9c58124d65027166bf43c7a4b2afd7c3971e..5fa314df72373cab2d8e211d24bc574f423a29cf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SessionInitSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SessionInitSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessage.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessage.kt
index 7ed0e8e2a5b3e15b81fa45578382686e7f95cfd1..ccf504023981dcc1ac7f1633a92fcfdf999b34b0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessage.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessageSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessageSerializer.kt
index 6885ed9ea79733dd801b793736aaf470e3be73d0..366ff7ca45ef4c812a623ad4d740fbf782546c14 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessageSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SignalProxyMessageSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SyncMessageSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SyncMessageSerializer.kt
index fdb261b8fbf0b22b9934b97f0e45c9b993acd2dc..cfbbd0d462bb1f43b6e3ded9ff72e2d7c4889753 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/message/SyncMessageSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/message/SyncMessageSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializer.kt
index 776d107088b7eee526a1b07c96eb6cff1938e420..252f7d091ac5ffac743d98e53fe2963a9387a1e8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializer.kt
index 3d68b0748ccacd6746ab362dc817a57efc860b2a..93f05628d121b5267ddb04f568edb8cc51fe6ba7 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializer.kt
index 443b4d4d145657c9d52f6b9ae810ffbe0337a893..a90fc1c9b801ea50e4c9342281375ed4111e3d5e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializer.kt
index a202634b45d5b5f6155d31e42919f283d34b9a2a..31cb3ae79044fe7e898dfa8243469ae9b49c6cca 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializer.kt
index 101743baa4d5fc8741f717ee085d97c1a454ce90..9b59c1b3a60fdd2ac940eab0d78d6b9f81f2f480 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializer.kt
index 197d263056967d04103ca2f1327d3d2446aa9438..6954dc0ba0220d8a2a9aeefd121ed049036d41bf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_IpDetectionModeSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_IpDetectionModeSerializer.kt
index 226c893eddab8d51cc7d276213135707f48fabbd..4dcb5ed33255660e0358ca50e9d2d788a56445ab 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_IpDetectionModeSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_IpDetectionModeSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_PortSelectionModeSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_PortSelectionModeSerializer.kt
index 16626ac1101cacc7943bb5c4cb756b7060b876c6..8d493675e7dc4e477e82b87b6b44bd97e0991425 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_PortSelectionModeSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/DccConfig_PortSelectionModeSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HandshakeVariantMapSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HandshakeVariantMapSerializer.kt
index d682b62890a3ccee72f6ae44622152294a6c6c3c..ec9bc8c938b7a67938505e527b884083e0adc9a0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HandshakeVariantMapSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HandshakeVariantMapSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HostAddressSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HostAddressSerializer.kt
index aae2da9986828062a0901ae15884c2a0b5da1bee..7c1b504330ea428b3a539311f88286e848206d75 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HostAddressSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/HostAddressSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializer.kt
index 291ebe2f2d94ea1b0707368ffe772f89810c3927..c96888be7f818f40f34d77c6f653eec93ada8b5a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializer.kt
index e4800948459987391dcd80a087d2f1438bfc45e3..f1009181a66ea265d67618bfa78a73bb9f34b4ee 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializer.kt
index 09397572b90ffbf3e7110ce7cc580b8ea5294e46..36a5c7a30a3236b51b99340815062b10782d2e6d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ProtocolInfoSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ProtocolInfoSerializer.kt
index 5e7b7a6b010a01bf3909257819eed1db212ca08d..1d18e14a760a1651d3d521780522ee1e076d22b3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ProtocolInfoSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ProtocolInfoSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializer.kt
index 6306c3b251eb117e8e8a8a04b7193d0608a71174..491ff77f11f8664ed29cf6fe61dde4969b7a9e82 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringListSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringListSerializer.kt
index 9db9720c06628ae21df2545dbf9a31b257dc670e..8bf61a32e532072045a86d2b813ee7c07ab4df1b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringListSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringListSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
index 93c02899a48a3343deb164f4eb8d5fda2f0296d5..40cca0acd77bd1fcd36d697bcf1e4848f750b619 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/TimeSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/TimeSerializer.kt
index 637f0c81ce4fa8bb3baa6e8829f91f4311999763..8075ad75292c88fe9c58d613bae331c71188086b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/TimeSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/TimeSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantListSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantListSerializer.kt
index dcf4222b027ddf3b4afb10cbe6fa99c837ed3554..d31ea6d63c742871a3ca1b311144b9715ac92c22 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantListSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantListSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantMapSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantMapSerializer.kt
index c168fd83d480c6901ea35b17eb07456dd013bd7d..7ae80c6427f05f37fa7db8748bc68cec361052f7 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantMapSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantMapSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantSerializer.kt
index 0f507b98f5e4876aa0b883bc033d8e284f2d9f28..1f916e90986c350e0b1f70879395714ac76d77c9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VariantSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VoidSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VoidSerializer.kt
index 2a5e92490e28f3661feac421a92c2b2e51f4e64e..e28a1ff0d76b530f24ac02cf43a224cefb3fa892 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VoidSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/VoidSerializer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/BufferInfo.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/BufferInfo.kt
index be3f40ce533ef2c4c57ab04c9e44bbf4a8fa5fa0..39dde056a36040ed58424cf0ad9d2da9e8dc1dfe 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/BufferInfo.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/BufferInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/ExtendedFeature.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/ExtendedFeature.kt
index d3205d17f7380f404502237894f5dc03d65681bc..61ab9cd0fb64e42683575a6f5b58d699af7c1a8e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/ExtendedFeature.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/ExtendedFeature.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
index 200baf87f1e1746d74f846653a91bb5b644a5ea9..3cbdf7e107695036a1cdb328c4066ee7b25917c9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/LegacyFeature.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolFeature.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolFeature.kt
index bf5824cafaaee05103bd8124ad7be5418a5b9aad..d2b8663dc78a241f64c659847d9c04ec811993f4 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolFeature.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolFeature.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolInfo.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolInfo.kt
index d45582ed0d88e8aeff049a0b2e59b1b79e37a01d..4ef8093159c4c757ec5e9a7d901d33e159edaa5c 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolInfo.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/ProtocolInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/QuasselFeatures.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/QuasselFeatures.kt
index 32d4a97c9de01e14429f383715ddf6928cc23c2d..33334f4dba2d4c3a05e622bdd072b8801e0170e2 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/QuasselFeatures.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/QuasselFeatures.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/DeserializationException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/DeserializationException.kt
index 0fb5e49d77a1e8c9a6752a5f5642594133586589..2403886f87aa23adbb4f895fcba8f32742bfdcd6 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/DeserializationException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/DeserializationException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/MessageHandlingException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/MessageHandlingException.kt
index c4485055389295506c22fec6e4578a9f6564a097..e9e120e2144503bbf57f4c72f3eab7061777bb16 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/MessageHandlingException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/MessageHandlingException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/ObjectNotFoundException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/ObjectNotFoundException.kt
index e748608d638592d16b04d536dd62f4c21a0fb655..c4efc1ae3b5c1b700c92548a827624efab465c55 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/ObjectNotFoundException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/ObjectNotFoundException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/QuasselException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/QuasselException.kt
index 3a3b11e80e82759ca323776d0ddb41d42061265e..74a20d3352d4cce89057237db5508d58141f5141 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/QuasselException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/QuasselException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/UnknownMethodException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/UnknownMethodException.kt
index 22edcee5b0681ea575a47b7c35030d68764bbe9b..76bde7336d98f562eaf34885029f4eb1360ee3aa 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/UnknownMethodException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/UnknownMethodException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/WrongObjectTypeException.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/WrongObjectTypeException.kt
index a8d50f79c54a0a269261f314021a33de0ed789c2..8c18fce3634d7144f10cb19acc2c7fbe80980217 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/WrongObjectTypeException.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/exceptions/WrongObjectTypeException.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/AliasManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/AliasManager.kt
index e314f104d7d635a07798229c133ef00309327e71..09b05a2c7382fc5b7b47dfbfcceb68bf30c5ac32 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/AliasManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/AliasManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
index e62678a4bbf5e3b5afc63df8b7ca2c6bad284410..39fba34698439512996a203aba626e47a0e02326 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BacklogManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
index c01656855dd0baa6d357b26a05f21976e399312b..cb222c566d6538ae3d5cca8374618d82e3568479 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferSyncer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
index c294c9ac85746f268f3817d103bb1685598172c3..a0a2125281e283228637c073c8ef4b3eb92943f8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewManager.kt
index 1f67bef74521580cb4c1e014e7f463081843e249..3e558f47f3805adc9c3f3eafd79976d45be4c409 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/BufferViewManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CertManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CertManager.kt
index ddd6b615d30bf6a2a0d5997a12a64475dcd4a5b0..69a9b7719af668cb02cd2b9c4e27e9e897ff9c0f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CertManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CertManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CoreInfo.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CoreInfo.kt
index fe877eb1087d207ab2f2a009233027cf61c1d6ff..da634ba3aae37f5c676c6e98eafd9a69809333d7 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CoreInfo.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/CoreInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/DccConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/DccConfig.kt
index 0b64c3b26cbc495b9f3e94245c0fc9d67ebc7ffd..e2e4049b4c07fed000b3aa468ec89564d75887f2 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/DccConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/DccConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManager.kt
index 5cbc1eeb46d608172013d9250114d0fe280e7877..e65dbb30be1694d77724fa6ecde05c884428d82f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Identity.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Identity.kt
index 0597543de120c8aa03abda14d36e17c16045daf8..971ae1e8f05d2ce2c0e6e46f127b984f986a05b3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Identity.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Identity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManager.kt
index abccf0850d1f1443e0d174660e187dffe2042eac..1bc9c4ef65b63aad717607bc1f3931ddf19cbdfb 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
index 2e003d1bb77c01ee4a73c4a3f66a9ec4903c5aa0..5fa7adf6ad7a23fdee476153911e74811b9f6347 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcListHelper.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcListHelper.kt
index 8660a2a5eade4ea3b9b1d640c7da520f6dbe6345..13de745d98847f50ddc722bcfbcd17a82353d3c3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcListHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcListHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
index 4ba2a60b29516a76a91714936622dfb0e73cffae..4be36c205eb9bd8f09e7f4ba383137d3fe7043ab 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt
index ffba8e3ec02de6ff145291731d931368aafb878d..c8be2b0a835cfbfb30659ce7e82ee8da51178c8b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/NetworkConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/NetworkConfig.kt
index 115105212a5e61e1c0f1735a48caa4e93e00cc13..1938f7e8237f06ac071536d4895bd5a0bb776c0e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/NetworkConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/NetworkConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
index c54cfc3c980678d4aa5c3871ff7c165760304f0d..f9a31b3072720a4641039bac7dc900f5c1ba245b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/SyncableObject.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/SyncableObject.kt
index 45c2767aa324c73c6040e347ee50c880e7c1031d..e214b9b81d3e7cbd6137d2893d1c18ea547f2691 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/SyncableObject.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/SyncableObject.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IAliasManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IAliasManager.kt
index a16148702e97d9bc1e2cfb133d2ce644e7da78d2..86b746a4ffd2e25ec689c225fb89799c2d46654d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IAliasManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IAliasManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBacklogManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBacklogManager.kt
index f7e6ff002261d5d461364bf4f202d4e990dd3367..655f90f558409566ccb3bdae07b139ea4359909b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBacklogManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBacklogManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferSyncer.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferSyncer.kt
index 3849eef38cd0ca425f699e60a43fbbe595f287a4..60c1bf543e1d039205f312f45222e7eb14c157bf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferSyncer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferSyncer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewConfig.kt
index 1032a24906e4439e5ed516ddf5876044471cdc9f..068f9daa04765ba46cb33c525935827449b84a87 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewManager.kt
index 744a438cf5a11c9863929340057042bd11d8d943..b55a0da53fb892a2097edbd36c446bca8cab5861 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IBufferViewManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICertManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICertManager.kt
index e8515c8c823888f17afff7429e85ada6e5a12457..02fdddc8dc0f03e95a6ec0f15ac3374d87835bb3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICertManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICertManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICoreInfo.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICoreInfo.kt
index 930395fc454dabec72426598c14a1c3fcb730627..aef75b5bfa378a1a997110cf59db315b9edbdcb4 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICoreInfo.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ICoreInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IDccConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IDccConfig.kt
index 3d377d111f1dbd3fb33042e465041dc98966c76f..22ade4b1009aeccd0b6885520e9ecdc1091e3361 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IDccConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IDccConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IHighlightRuleManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IHighlightRuleManager.kt
index 117e0a8b20aeaba5c9ea60fe656050afd3c9cf5e..651a956cce69a5cdd768db4758e8366979c19a36 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IHighlightRuleManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IHighlightRuleManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIdentity.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIdentity.kt
index 862d0058a188b36f174eefcc19c4757d890c46c7..3332c4b00cd0cd5b6c05d3ff377046f78aa4ca06 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIdentity.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIdentity.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIgnoreListManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIgnoreListManager.kt
index 5b2413caf1d60219b84668f99abdc0ee1672fcb0..e5883cfa945988aefa1b0aa853a8675c1b55fa7d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIgnoreListManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIgnoreListManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
index bbdd5c3df6c1efa5e758adb1756b295cdecd717d..c0cc1df06a00472fbd0e876afbd96f20aa5a46d2 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcListHelper.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcListHelper.kt
index 2f87159908e2720ec285af65ed1d5669628ca5a7..9407f207a63b41533831683c4455b651d75a9cbf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcListHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcListHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcUser.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcUser.kt
index f3c128cbc5fb4d673a062dfc6360b3a7c41fd551..e37d16c9e8d3922fe65f50389b4384f8efbffa73 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcUser.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcUser.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
index 61d37fb6971a569f815678b9d5826cd059169679..74e760d48a05cde55fbd1c50629c50e38402751a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkConfig.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkConfig.kt
index 5d7a955d9f59414af82c98923176ee3949f79835..66d3de8c81e7b538d5ddaf7b56a70fb7bb5975c2 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkConfig.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IRpcHandler.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IRpcHandler.kt
index b0ac0444c526893e72df0ccf4d8cb2708769cb15..948d8491eca26b63bbc3107129e57ff46b1645fb 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IRpcHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IRpcHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
index 7174dead55268c4c855482ebe113247217aade53..a726fcfab6fd1de5a43cb449d2f71661efdafebf 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransfer.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransfer.kt
index b04f3d5c498ac128f8ff7fe1cf132298286fd11a..476ccec11916af7ab612e5bf07f0d196c4ed2a3e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransfer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransfer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransferManager.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransferManager.kt
index 4f67a5830fc51e87db1a94c326a4b475c263fa3f..5653c26a7853ab30defda3069251a1f26ffc24f7 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransferManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ITransferManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invoker.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invoker.kt
index 4eadf95943919f1aeb38f5e153cd16ff65bb9ba2..22841a37536cc4f9b112b8df53a85542f202337e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invoker.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invoker.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invokers.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invokers.kt
index b5831017524cfef58e9a402f640b0a12aeb4a672..41057ed2fc3c39fe8a439d183984cc4f79cd12a6 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invokers.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/invokers/Invokers.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/AuthHandler.kt b/lib/src/main/java/de/kuschku/libquassel/session/AuthHandler.kt
index 71008cfcb169ee341052d3282895175e87834d83..237f2e97cb093cbe8294fa6ce6ec0e6ecce28fac 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/AuthHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/AuthHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Backend.kt b/lib/src/main/java/de/kuschku/libquassel/session/Backend.kt
index 6101a971ea0a367661ef9666ab1a347590051900..08bbf9c6b8a3c2d68621f8905fe8ec2e6720b4f5 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Backend.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Backend.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/BacklogStorage.kt b/lib/src/main/java/de/kuschku/libquassel/session/BacklogStorage.kt
index 1efa912d282364923914a050ea2f0b23349c3046..e2a91a00586cb55a368d5f9111ff661a40624dc9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/BacklogStorage.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/BacklogStorage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Error.kt b/lib/src/main/java/de/kuschku/libquassel/session/Error.kt
index 6ccbed7ccdf220559c205c1732528a34628a8808..182ff0675439ac229524d2de3ba177365904d0bd 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Error.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Error.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt b/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
index 7296d64295e68c952bce5763a4b4926c0f14f36b..f6af0a50dca567e727a82ac0f07496537418e9cb 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ObjectStorage.kt b/lib/src/main/java/de/kuschku/libquassel/session/ObjectStorage.kt
index a8fac30913f9b380d784ad5095534192e066c4d8..d9195809d4e26189217472cb3a74946a6add3dc3 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ObjectStorage.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ObjectStorage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
index 301973b491ad6d0db1f52f20afede7857d906be2..6e94e6aebe75f96de2f2adaa3dfbc8797d1ee0e5 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
index 41e2979433ab4286b786b688066d5bfedbe75686..251c6b4037687644e8cd89a539555a44871b0007 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/SessionManager.kt b/lib/src/main/java/de/kuschku/libquassel/session/SessionManager.kt
index 4df9414ac4de34c27bd426b1adc2e6c8575eaeed..53562b631f517e1ced7649dadbf55938173835c0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/SessionManager.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/SessionManager.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/SignalProxy.kt b/lib/src/main/java/de/kuschku/libquassel/session/SignalProxy.kt
index 53eb945a1c1b85e6ece742a0acf2ba62ed29b815..98c1f5d09d606335400132f4b0fecfc9d63e37e8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/SignalProxy.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/SignalProxy.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/CRCUtils.kt b/lib/src/main/java/de/kuschku/libquassel/util/CRCUtils.kt
index 1e4ba6c08f9e2c1a2e8043c11bbf4f3f415c1647..c4e80842632e8bcb0302e57afc25c0c37d1d0e0d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/CRCUtils.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/CRCUtils.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/GlobTransformer.kt b/lib/src/main/java/de/kuschku/libquassel/util/GlobTransformer.kt
index dd8ff56749267f8aca8381389d555a9c5e248fc8..d433ea4553fb185d184f86dcb506a1aad394ec70 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/GlobTransformer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/GlobTransformer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/IrcUserUtils.kt b/lib/src/main/java/de/kuschku/libquassel/util/IrcUserUtils.kt
index 2f08fab99942982765266315558b62577cf170ea..3be85d0e1495d00a319e5a89f972958ffb67afb8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/IrcUserUtils.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/IrcUserUtils.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/Optional.kt b/lib/src/main/java/de/kuschku/libquassel/util/Optional.kt
index dccfd0cdf667926016408537c9fbd7e6f37e0a3e..5eb3a75be3947d4cb94b243d6537eb1527945758 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/Optional.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/Optional.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
index 96c4ccd71cda0f547c9c9155ca6212e12788c510..cbc90e4efa0ed70520f80715fc13a652d7e6fe0c 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/CompatibilityUtils.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/HandlerService.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/HandlerService.kt
index b8e28de7db50dbf79068aa88fa9996745a3db7b6..87b67bca101138d15aae9d3c1aa7b89a70fe5cfd 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/HandlerService.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/HandlerService.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
index ebc1341d418c22686d52b7aad8881d8ef8403399..15ea5b251ebc8af7a397ccfba41d26c4b67c0040 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/StreamChannelFactory.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/StreamChannelFactory.kt
index 5ab2866f3308c71fab0c5538d364cca3a9e0c332..d68c0fb352c3204948f98be6c283438e78d7823f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/StreamChannelFactory.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/StreamChannelFactory.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaHandlerService.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaHandlerService.kt
index 298e24194881261a6cbdafea2529da8c39b0b9dc..4098293a2fe9b280d4528e07d6317e5c8546ed25 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaHandlerService.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaHandlerService.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaLoggingHandler.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaLoggingHandler.kt
index 4a7ebcc82861240c3c0db56d1c442ed83d3f2dcf..088794fbf79117d061fcf23ab6bc7b55aae0e215 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaLoggingHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaLoggingHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaStreamChannelFactory.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaStreamChannelFactory.kt
index 5c7f573a8fded07f88d980a700f757de5748e747..03db86b19947682193feee6c951361b9a9947461 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaStreamChannelFactory.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/reference/JavaStreamChannelFactory.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/flag/Flag.kt b/lib/src/main/java/de/kuschku/libquassel/util/flag/Flag.kt
index 8eddf093f8d83a02c7282df80ab4d6c0bc7f8c20..ebc5ab6fc92951ebd01e522e084531cea6334a17 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/flag/Flag.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/flag/Flag.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/flag/LongFlag.kt b/lib/src/main/java/de/kuschku/libquassel/util/flag/LongFlag.kt
index 821ce58783a7ff154cab2e7155150732aaae75d0..9357cd96ff96d1af24c2511b11fd0255b6ae9a28 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/flag/LongFlag.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/flag/LongFlag.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/flag/ShortFlag.kt b/lib/src/main/java/de/kuschku/libquassel/util/flag/ShortFlag.kt
index 64ca63b0fac25f40a36ebef975d2873b257bdaf6..58242aa51c669977bf6db2ce0843447d0317f9f9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/flag/ShortFlag.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/flag/ShortFlag.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ArrayHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ArrayHelper.kt
index d774c361f6a130c534837192c13b64bfcb610ce3..c9f0b94b7d142d90df0420fb91ca1fc71e368416 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ArrayHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ArrayHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ByteBufferHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ByteBufferHelper.kt
index 1cecb76ce39ff36cfc3d66fd97ccb21ce9caca30..c8ca01ff1d6e760031ebe056fb998ec5f88c9fe8 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ByteBufferHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ByteBufferHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MapHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MapHelper.kt
index e8781855d56b4ece5498317491f28701592a4016..a8f9f1b3f6838148985dd7dbd64e699ce02f1401 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MapHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MapHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
index a63ac2d3c4b5220b183bf22071b62e6b033469d5..d7734924810d5715ba17cc0c29b65b0bb010e56f 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ObservableHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ObservableHelper.kt
index 03914b326f5afb241946763d1a289e6f2dbc878e..fd746998dcef021934e265436dffb394b6e24388 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/ObservableHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/ObservableHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/StringHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/StringHelper.kt
index a27d43bb0af011cf290945227cd5bdcadb75b374..b5b10fc2713cfcb9018eefde1e736500ec717c1b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/StringHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/StringHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/WritableByteChannelHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/WritableByteChannelHelper.kt
index 941ede7f206eaa27b086ac1feb185e93b648c472..cc7b5975f94e8ccd4132b2c0f3fc2a20be34c1ec 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/WritableByteChannelHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/WritableByteChannelHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/irc/HostmaskHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/irc/HostmaskHelper.kt
index f7a6e439d260783f87a3008aca39c118db6a8306..ef0f4c05b69c0a4c9605c00d62a2f06ee3342744 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/irc/HostmaskHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/irc/HostmaskHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt b/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
index 492918788caa5b89cabf88b3cac6087f7c173b84..03b489189abe8c38ee05716a2e4a5d406b6cbc8a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/nio/ChainedByteBuffer.kt b/lib/src/main/java/de/kuschku/libquassel/util/nio/ChainedByteBuffer.kt
index 5610cd4c21acf88e1669e94f27f23fed514f571a..9d1809a8e746afa03a3903164448cf95b46d0232 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/nio/ChainedByteBuffer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/nio/ChainedByteBuffer.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt b/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
index 81dd95e837ecdbfea9ab9984f99950f4221b6547..7f2b0b89705fc617a9febde0ddf4b5ca3bc91ed7 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/nio/WrappedChannel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializerTest.kt
index 49d3b020287b22d40560f3027c5687ffe935517c..d66d13c9dab6d2a28040b0dd03a284c074e7fcd3 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BoolSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializerTest.kt
index 3c9c312d4feab7ea5b20043575d3dd1d57058dbb..b26a8dc6f4027e03e3aa8ecd8b3bb8f93ed3e9e6 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/BufferInfoSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializerTest.kt
index f22f3b5aef21070e91a3e8c42e85fa2257e500b4..d1a457ac0272d59dcd1df0ae485c5e1f94db0ee0 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteArraySerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializerTest.kt
index f5c65f3c149744f790bb9bd7ee33384175ae2e7c..0e8ad9ca10443c69ca1e774c77e3d65254750601 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ByteSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializerTest.kt
index 36e1ab392e6030846da4412b79c2c8a3b6d08596..64c10ecfbfa6eea4c34459336ba425d6ac16a789 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/CharSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializerTest.kt
index e8c36567b9a9771adc7367be98d1d2e9280a3c08..a7a117a6497882257d119ed01a7d2b49223c89c8 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/DateTimeSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializerTest.kt
index cdfa2371fc503072ba02ad3257bd465e6b4bec33..6c6a58e09a06d6d4b41ad3e86e80f88a0b6ba275 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/IntSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializerTest.kt
index 97b50e5fcc2cdd5cc464834e80002363c35afc0b..1b7fd485e3ee55a1c412a77e3668ee7d830772fe 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/LongSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializerTest.kt
index 2265521e209a4f337abe0ccd7eb7e46bfb7402a4..0da1f8ab19ac1620efa7ff45094e5a862bc4cfb7 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/MessageSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializerTest.kt
index d9f7ed3c1f7895779440dbc646a0024ced248a6b..962d0a2af3840dbbca566927657013ac30280796 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/ShortSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializerTest.kt b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializerTest.kt
index c76e2971e6daea6b5e9c937b5167c8e7c7c48ec0..4d47a57f0895625cedf1846cfcb69a90eeb0ed16 100644
--- a/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/AliasManagerTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/AliasManagerTest.kt
index ca565e90422d2e4cb57af4db1cba31a2c3209a84..189b7417330fc5b709555c2aa06001f63cc81cac 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/AliasManagerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/AliasManagerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfigTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfigTest.kt
index dabda1aeabd46f1e3ec94592f7b1d6acfabad439..614c0c9711fe2b02f5955598216d5ab4de76560f 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfigTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/BufferViewConfigTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManagerTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManagerTest.kt
index d54d20c8b8d614ab2fc6eb6ca2600fb43350c244..fd87e3f3b08faf84c123252f91d45f33d654ceb7 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManagerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/HighlightRuleManagerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IdentityTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IdentityTest.kt
index bc86422b77114a98949ee8e823b9408dcb0100d0..be22d5fbfbda82fdd8964c035e662999e92e3fbd 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IdentityTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IdentityTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManagerTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManagerTest.kt
index 54e41b802e9768d20fa8767b9fd30d8c1ec1e5ef..28757f498268a70a7a63c30c521b03bea05934ed 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManagerTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/IgnoreListManagerTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkConfigTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkConfigTest.kt
index a2eae497bd9550c888f784835c2d24eb02a8d721..55b141ad54957d3d1bd855784489b9eafc671fcf 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkConfigTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkConfigTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkTest.kt
index 7c4ba053884bb2c738dc87c7d6df295c1c14b803..63e08ea91e0888e7cad135c1d24e8a79dcb33de0 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/NetworkTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkInfoTest.kt b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkInfoTest.kt
index 9612c14396f9332da868726b300927cbe3c4194a..7ac33e9418535b0c6082c27cb62ef086a60704b5 100644
--- a/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkInfoTest.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetworkInfoTest.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/util/RandomHelpers.kt b/lib/src/test/java/de/kuschku/libquassel/util/RandomHelpers.kt
index cc6bddddcd849e1772c16bb69bd65f96f2451d31..72b83012065a9dfc58d51dee32405b1a95b262f4 100644
--- a/lib/src/test/java/de/kuschku/libquassel/util/RandomHelpers.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/util/RandomHelpers.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/java/de/kuschku/libquassel/util/SerializerHelpers.kt b/lib/src/test/java/de/kuschku/libquassel/util/SerializerHelpers.kt
index f0cf913bd63e6b1e8d719a2d07f900833dab7c73..9b1c41e80b6dca6a195fcdb3dd8a0a34909b758e 100644
--- a/lib/src/test/java/de/kuschku/libquassel/util/SerializerHelpers.kt
+++ b/lib/src/test/java/de/kuschku/libquassel/util/SerializerHelpers.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/lib/src/test/resources/logging.properties b/lib/src/test/resources/logging.properties
index c827ad2d8c6091ac614edddea12686f5b034dfef..a6287721109017febe51d7bbc3c8192a9e0f3f50 100644
--- a/lib/src/test/resources/logging.properties
+++ b/lib/src/test/resources/logging.properties
@@ -1,15 +1,14 @@
-#
-# QuasselDroid - Quassel client for Android
+# Quasseldroid - Quassel client for Android
 #
 # Copyright (c) 2018 Janne Koschinski
 # Copyright (c) 2018 Ken Børge Viktil
 # Copyright (c) 2018 Magnus Fjell
 # Copyright (c) 2018 Martin Sandsmark
+# Copyright (c) 2018 The Quassel Project
 #
 # This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
+# under the terms of the GNU General Public License version 3 as published
+# by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +17,6 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
 handlers=java.util.logging.ConsoleHandler
 config=
 .level=ALL
diff --git a/lint.xml b/lint.xml
index 9e813ae3b0ba724acd1a7357908aec0844fd0b29..0b279725b1c9ff43d756e7ee515d1eb5c979035c 100644
--- a/lint.xml
+++ b/lint.xml
@@ -1,3 +1,25 @@
+<!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <lint>
   <issue id="NewerVersionAvailable" severity="error" />
 
diff --git a/malheur/build.gradle.kts b/malheur/build.gradle.kts
index 1bd79c8f92e90b74858b4c4bf2a31f61fd9814aa..8afb5cc04c907566824a763686fc85f019e43788 100644
--- a/malheur/build.gradle.kts
+++ b/malheur/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/AndroidManifest.xml b/malheur/src/main/AndroidManifest.xml
index 7e73b4c6822283fd67b0639cec0cd50d3208de61..e20973476f135c57768369002ff7a1ced917605a 100644
--- a/malheur/src/main/AndroidManifest.xml
+++ b/malheur/src/main/AndroidManifest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <manifest package="de.kuschku.malheur" />
diff --git a/malheur/src/main/java/de/kuschku/malheur/CrashContext.kt b/malheur/src/main/java/de/kuschku/malheur/CrashContext.kt
index db73d516ce44b3deea61f43e67f1328c235329b2..af63f1e39213d763d021a10469597103d26db333 100644
--- a/malheur/src/main/java/de/kuschku/malheur/CrashContext.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/CrashContext.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt b/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
index af15b98825c222ada85d8280a957f00c3874d61e..93023e68fb6226b470274ff527bc9258ef8f8309 100644
--- a/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/CrashHandler.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/AppCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/AppCollector.kt
index a6d93378a2c4b42cdaee48f2d027295c2f47cdbb..6e923cdcfc98db911ac2a99c663e185a44151e5a 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/AppCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/AppCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
index c5901c9b5a78b60fb23d9d4e651d65d3bc756e0c..4b5a1d6abcc9cb4217fb7ae3f6c3041203a540f8 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
index 6b58ac2cc1fa44598354e6703dd33760a878f6dd..d94abc65e9c995700f1a954ddcf0fce3f2e7abab 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/CrashCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/CrashCollector.kt
index cf7620e69fd112f86bdda788cd444094179b53da..eac3e97e50b0780ad3ec9c0cc553586434c5eb8f 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/CrashCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/CrashCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/DeviceCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/DeviceCollector.kt
index 08cc994ac052b2c4ceb07735e0a51747e4c47ff9..0799fa43396420a018e97444e3d3163205a223b2 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/DeviceCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/DeviceCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/DisplayCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/DisplayCollector.kt
index 076fa53fb6ede1394ff9c57131d5498b9c13d86c..f7374cf527b8f263a5df2d9ada60903661787758 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/DisplayCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/DisplayCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/EnvCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/EnvCollector.kt
index 4bfa653e5f7ce55b5cb836c6c9efa3604f7a6a5a..2f2ce11b20f14a4f584fc67ad1153515573bdb3b 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/EnvCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/EnvCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/LogCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/LogCollector.kt
index ae7bcd22e14810e69eb9ff3d4aedf038d3d6dcd0..935477e9a914f5b33027408998c9dda352c1cd71 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/LogCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/LogCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/ReportCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/ReportCollector.kt
index 441ee63e636ca1546ef87e0b5ea10f3e79bb140e..e6af6e33b6514a9c6838ca58d283782ed6f4150b 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/ReportCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/ReportCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/ThreadCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/ThreadCollector.kt
index eab0082ad34a5d5d3436a2f61b739b0a1bd8f04e..04bf527bfbd3cc80a51d537f70a60bcab537a8f1 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/ThreadCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/ThreadCollector.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/AppConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/AppConfig.kt
index 6ea3a583f28f29eb13b772b9d66d3f2e8a3d6560..94f8c6483741a02db6337dc8dbf45d6660147684 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/AppConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/AppConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/CrashConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/CrashConfig.kt
index 1ef2bc143614e4858ab2dec5f7a5752869ded7f1..b459fe1a45214080101c59c1af0bc7308946e1de 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/CrashConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/CrashConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/DeviceConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/DeviceConfig.kt
index e2decb37679a24afc21d2fb1d3eea3e0b27c6b68..47824ed99c4a8664671d20117f6b0605d4b3ae2c 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/DeviceConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/DeviceConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/EnvConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/EnvConfig.kt
index 8895e04e175f03902c7a4623bc65c7b3ebdcfcab..4f2eb53bf018f51089102efee1c4550286492d22 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/EnvConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/EnvConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/LogConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/LogConfig.kt
index 605f32482b5198680b06ea5faaf92a515bdc0248..7432278592f5c19399930777f02ec1ec28f36892 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/LogConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/LogConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/ReportConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/ReportConfig.kt
index 3f2f07b08c73d321da5dc1ffeea5afba859c0ad1..3ba71cdc72a96a8e0773392221e43df7119c2473 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/ReportConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/ReportConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/config/ThreadConfig.kt b/malheur/src/main/java/de/kuschku/malheur/config/ThreadConfig.kt
index c779eebbecebb5edf18ff4a169edeac97d57f698..77b78b4f1275f308fdcea388eaf23cb6bcda1929 100644
--- a/malheur/src/main/java/de/kuschku/malheur/config/ThreadConfig.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/config/ThreadConfig.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/AppInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/AppInfo.kt
index 9e474d30067907ff8d3aab8ec5f3f3d4ee21f8f5..fa83460d697fa62eed8428a534d4d5b02f60774b 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/AppInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/AppInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/CrashInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/CrashInfo.kt
index 6aaf3107430ebd51fa232ff0effd4475ef6e20c3..5a9f5e63f0b88b9ab879b8c487d8b72eedfea633 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/CrashInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/CrashInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/DeviceInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/DeviceInfo.kt
index 8c741f111c8b2b4b5c73cd2c7a4fc9a3b463f1f2..2307a73d3b90d31941a1f8b519f8bfeb1b4ccb1e 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/DeviceInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/DeviceInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/DisplayInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/DisplayInfo.kt
index 88d249e46baf4358bbdeb106dd44dee801a53407..427f54a4fd91fa97596fd66cb1cf2b5cc2c00f3e 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/DisplayInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/DisplayInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/EnvInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/EnvInfo.kt
index 45ad404efa5e593a0de93e0b082661a1b658c2b9..534696b9b4a76348405928932119a69d7d2bc578 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/EnvInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/EnvInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/ExceptionInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/ExceptionInfo.kt
index c40b780d77e54a85f59a750ab8edebe59fb65035..032c0816977f0b54e469a63aa4ce7f8a4d0ff182 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/ExceptionInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/ExceptionInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/MemoryInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/MemoryInfo.kt
index 154b8ce1fa4459f06e3861b8e408bb75d7ec79ad..8050dbc83289aac35deefdea60d14c8a385e8a64 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/MemoryInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/MemoryInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/MetricsInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/MetricsInfo.kt
index 14c2024a47c28d48b78b9ebe25c9b1b485169987..2ac3381266ceed9b6150329ecaa62101c5078617 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/MetricsInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/MetricsInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/Report.kt b/malheur/src/main/java/de/kuschku/malheur/data/Report.kt
index 69fca4168fd74ecb124e1aa330a71a26475818e2..6b5b914c149a8c5ae50661ed186bc9972a06e337 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/Report.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/Report.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/ThreadInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/ThreadInfo.kt
index 9460ad57cc7a25ad0094f980f0538ca508b88aa5..2006b832c952e5468c9925b33fe9364076bfb4f5 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/ThreadInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/ThreadInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/ThreadsInfo.kt b/malheur/src/main/java/de/kuschku/malheur/data/ThreadsInfo.kt
index ad2dcbb44d5448ab7e4aefd3b2325272a891ec3b..9e054c0bad25d882e91beefcae9fb818f6adec5b 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/ThreadsInfo.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/ThreadsInfo.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/data/TraceElement.kt b/malheur/src/main/java/de/kuschku/malheur/data/TraceElement.kt
index a6750fde7510926c6819249102611ec763cb47fe..7c4ce2faf6e5ff7e1e16936ea1e4f4eef36f13cc 100644
--- a/malheur/src/main/java/de/kuschku/malheur/data/TraceElement.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/data/TraceElement.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/util/DisplayHelper.kt b/malheur/src/main/java/de/kuschku/malheur/util/DisplayHelper.kt
index b3ea86af2f7ff4ceeaa4cb66b119840c5ddd8e4d..a2258af9d6a3d492ab66fa3dbf65a82ca2f8074b 100644
--- a/malheur/src/main/java/de/kuschku/malheur/util/DisplayHelper.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/util/DisplayHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/malheur/src/main/java/de/kuschku/malheur/util/ReflectionHelper.kt b/malheur/src/main/java/de/kuschku/malheur/util/ReflectionHelper.kt
index 0246e01dd18da4ebbe9d17cb32efb7713c7639cd..a67823cf57ca2070165533fc39baed9bc484f28d 100644
--- a/malheur/src/main/java/de/kuschku/malheur/util/ReflectionHelper.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/util/ReflectionHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts
index 091ab25e1c37b300a520a818c54934266d0b2322..09d7c058a701e53d09af071977f6e184b1d7815a 100644
--- a/persistence/build.gradle.kts
+++ b/persistence/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/persistence/src/main/AndroidManifest.xml b/persistence/src/main/AndroidManifest.xml
index 5dddb837605c85b5ad59ab54fe6f7856cb668d1c..64217d9297ebf3eed8be09a88774da3da66c6b40 100644
--- a/persistence/src/main/AndroidManifest.xml
+++ b/persistence/src/main/AndroidManifest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <manifest package="de.kuschku.quasseldroid.persistence" />
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
index 626cc761e08510f7a6c087071d56c47f3030a281..a18c7c52269a5f5fc3555fc80b015d19a828833e 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/AccountDatabase.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
index 30c6ffe9021e9ab3df81710241dcb5ee646484a3..f448a885303c989290929dca7aaabd6ff06d4882 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselBacklogStorage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
index e07a62402b876371ac73e4aa9f3ee7d0db308e25..2a35c3c414440643d0a8ae1cc3b27430b85bd2d9 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/QuasselDatabase.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/settings.gradle b/settings.gradle
index 91ee4e247ecf298ff5debe19aebc994f219771f5..9fcd32ec8832390ea68ebd5f18e2ec6d65323456 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,25 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 Ken Børge Viktil
+ * Copyright (c) 2018 Magnus Fjell
+ * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 include ':invokerannotations',
         ':invokergenerator',
         ':lib',
diff --git a/slidingpanel/src/main/AndroidManifest.xml b/slidingpanel/src/main/AndroidManifest.xml
index 30c18586b960c94687f4963f04a02cdf3afd9319..f93c5b025907da254cdb9e05616561a130c3b760 100644
--- a/slidingpanel/src/main/AndroidManifest.xml
+++ b/slidingpanel/src/main/AndroidManifest.xml
@@ -1,4 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.sothree.slidinguppanel.library"
   android:versionCode="17"
diff --git a/slidingpanel/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java b/slidingpanel/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
index d5539a85f1c32568525f5619ce44b027c051d63d..0e77543ada017f87f4e34d886cb3297f62f0601a 100644
--- a/slidingpanel/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
+++ b/slidingpanel/src/main/java/com/sothree/slidinguppanel/ScrollableViewHelper.java
@@ -1,3 +1,25 @@
+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 Ken Børge Viktil
+ * Copyright (c) 2018 Magnus Fjell
+ * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.sothree.slidinguppanel;
 
 import android.support.v7.widget.RecyclerView;
diff --git a/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
index 5c20c6e8f95e39238dd4352883525c1da4c2277f..3e542259ab6a0d8cbfc5d836025a69bb70f55d27 100644
--- a/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
+++ b/slidingpanel/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/slidingpanel/src/main/res/drawable/above_shadow.xml b/slidingpanel/src/main/res/drawable/above_shadow.xml
index 7d0cbe926aab000ee5744562de5eb9c224e75cd8..6f60546a0790949ad9d4ff0216e9e090fd60d66e 100644
--- a/slidingpanel/src/main/res/drawable/above_shadow.xml
+++ b/slidingpanel/src/main/res/drawable/above_shadow.xml
@@ -1,7 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <gradient
     android:angle="90"
     android:endColor="@android:color/transparent"
     android:startColor="#20000000" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/slidingpanel/src/main/res/drawable/below_shadow.xml b/slidingpanel/src/main/res/drawable/below_shadow.xml
index 6af78fe1f6a6e9855dfa4c3e1abda773d78aa9d5..63dd0641299b77c325d4215097e4c7a4d4d08305 100644
--- a/slidingpanel/src/main/res/drawable/below_shadow.xml
+++ b/slidingpanel/src/main/res/drawable/below_shadow.xml
@@ -1,7 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <gradient
     android:angle="270"
     android:endColor="@android:color/transparent"
     android:startColor="#20000000" />
-</shape>
\ No newline at end of file
+</shape>
diff --git a/slidingpanel/src/main/res/values/attrs.xml b/slidingpanel/src/main/res/values/attrs.xml
index 89566734e622e087003df4fed5841e33b8459184..a5c43df1d068f16d76662f7e5dfff52cf89f0ad6 100644
--- a/slidingpanel/src/main/res/values/attrs.xml
+++ b/slidingpanel/src/main/res/values/attrs.xml
@@ -1,4 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <resources>
 
   <declare-styleable name="SlidingUpPanelLayout">
diff --git a/viewmodel/build.gradle.kts b/viewmodel/build.gradle.kts
index 55e2f01d6b31030987aed6c14430881b34481d62..7bb314e41e41b9696680773df0262b220b383752 100644
--- a/viewmodel/build.gradle.kts
+++ b/viewmodel/build.gradle.kts
@@ -1,15 +1,34 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2018 Janne Koschinski
+ * Copyright (c) 2018 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/AndroidManifest.xml b/viewmodel/src/main/AndroidManifest.xml
index 9f64abd7f00ab11dde968273943bc12b8c49b7b0..654c811b7404b5099770ae24aa1ed3a7b48c020e 100644
--- a/viewmodel/src/main/AndroidManifest.xml
+++ b/viewmodel/src/main/AndroidManifest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ QuasselDroid - Quassel client for Android
-  ~
-  ~ Copyright (c) 2018 Janne Koschinski
-  ~ Copyright (c) 2018 Ken Børge Viktil
-  ~ Copyright (c) 2018 Magnus Fjell
-  ~ Copyright (c) 2018 Martin Sandsmark
-  ~
-  ~ This program is free software: you can redistribute it and/or modify it
-  ~ under the terms of the GNU General Public License as published by the Free
-  ~ Software Foundation, either version 3 of the License, or (at your option)
-  ~ any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program.  If not, see <http://www.gnu.org/licenses/>.
+  Quasseldroid - Quassel client for Android
+
+  Copyright (c) 2018 Janne Koschinski
+  Copyright (c) 2018 Ken Børge Viktil
+  Copyright (c) 2018 Magnus Fjell
+  Copyright (c) 2018 Martin Sandsmark
+  Copyright (c) 2018 The Quassel Project
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 3 as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
 <manifest package="de.kuschku.quasseldroid.viewmodel" />
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
index ac2023e361aa537e2aab500f0bda9099051ef222..37dbe0b01c225b097fc7bd876b95b75379e6404b 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
index d3921e858bf4931ace3a056d7fbb8eba2c650728..dc0eab3134bdc30572afad23b2c388832856f191 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/EditorViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/EditorViewModel.kt
index 1861e81ed1e00eb0b114b7680f6b62d149587a0e..cdabb6985c4a962ccae03ae28f4a56e8465e4c8a 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/EditorViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/EditorViewModel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 31b20d994c244b3773f0d0e22e8bdf1306062136..4b1e722d5e1edbb58fab4fddfd59647f746ecffc 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
index 8f14c9e8861e65228dcef648bb9b997f6a0a10c9..ecef9ef83d7b35b6f9a8815db726edf53f975d9e 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/AutoCompleteItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
index cb01abdf40e57276ab75bf2a812cf7b8fef47f0c..5b087b83c7c03a08486366b4e3bbda77d68bc1b5 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
index e15ad57264437a693f50072134ec88faacde67cd..0f72673ed53f7fa0fed16cccc35831f4d8a255be 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferHiddenState.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
index c29e3e5f67c7b7125108b97f2945d7723eccf676..87e1479ae9dcb6a454fde2ab9d588984f7489709 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferListItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
index 794ea69953c55b47e644ca230b750940d701c40c..48d75f09d79f641ca22c8f23385f6caaa36f6396 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
index 7e8520346e1fb34ae8ab563ddb3e132487373976..727af2c484d02e4cf5898b96576056512b7303d1 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferState.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
index 13f84a696ae9544ccb504a71fa1e2004c96edea8..cda6cf1f774d3fea932bee398dd3cd8f3325e085 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferStatus.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/FormattedMessage.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/FormattedMessage.kt
index dac0316c2834b1d98dd21884abdda049babb45f5..0a6d3aae114744d6753fb669917d5a61db117f30 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/FormattedMessage.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/FormattedMessage.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
index 166ca49f4ceb893a88f0406ef0d4385455b93399..7622a3da12d480b0f222575487e2b70d32403b9d 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/IrcUserItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
index c799d029c5fea43da696acf4d2eb043aa40964fa..50d81611f7fce51cb823c8047898a00f08d8b231 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/SelectedBufferItem.kt
@@ -1,15 +1,15 @@
 /*
- * QuasselDroid - Quassel client for Android
+ * Quasseldroid - Quassel client for Android
  *
  * Copyright (c) 2018 Janne Koschinski
  * Copyright (c) 2018 Ken Børge Viktil
  * Copyright (c) 2018 Magnus Fjell
  * Copyright (c) 2018 Martin Sandsmark
+ * Copyright (c) 2018 The Quassel Project
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation, either version 3 of the License, or (at your option)
- * any later version.
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of