From 5e08f048764171d550ce17127c4075709bf9c2cd Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 29 Apr 2018 17:08:07 +0200
Subject: [PATCH] Branding, copyright, readme updates

Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
 .gitlab-ci.yml                                |  2 +-
 README.md                                     | 46 +++++++---------
 app/build.gradle.kts                          | 29 +++++++++--
 app/sampledata/messages.json                  | 10 ++--
 app/sampledata/recent_messages.json           |  8 +--
 app/src/debug/res/values-de/strings.xml       | 38 +++++++-------
 app/src/debug/res/values/colors.xml           | 38 +++++++-------
 app/src/debug/res/values/strings.xml          | 38 +++++++-------
 app/src/main/AndroidManifest.xml              | 40 +++++++-------
 .../main/java/de/kuschku/quasseldroid/Keys.kt |  8 +--
 .../{QuasselDroid.kt => Quasseldroid.kt}      | 12 ++---
 .../quasseldroid/QuasseldroidGlideModule.kt   |  8 +--
 .../quasseldroid/dagger/ActivityBaseModule.kt | 22 ++++++++
 .../quasseldroid/dagger/ActivityModule.kt     |  8 +--
 .../quasseldroid/dagger/ActivityScope.kt      |  8 +--
 .../quasseldroid/dagger/AppComponent.kt       | 14 ++---
 .../kuschku/quasseldroid/dagger/AppModule.kt  | 15 ++----
 .../quasseldroid/dagger/DatabaseModule.kt     |  8 +--
 .../quasseldroid/dagger/SettingsModule.kt     |  8 +--
 .../quasseldroid/service/AsyncBackend.kt      |  8 +--
 .../quasseldroid/service/QuasselBinder.kt     |  8 +--
 .../quasseldroid/service/QuasselService.kt    |  8 +--
 .../service/QuasselServiceModule.kt           |  8 +--
 .../settings/AppearanceSettings.kt            |  8 +--
 .../settings/AutoCompleteSettings.kt          |  8 +--
 .../quasseldroid/settings/BacklogSettings.kt  |  8 +--
 .../settings/ConnectionSettings.kt            |  8 +--
 .../quasseldroid/settings/MessageSettings.kt  |  8 +--
 .../kuschku/quasseldroid/settings/Settings.kt |  8 +--
 .../ssl/BrowserCompatibleHostnameVerifier.kt  |  8 +--
 .../ssl/QuasselHostnameVerifier.kt            |  8 +--
 .../quasseldroid/ssl/QuasselTrustManager.kt   |  8 +--
 .../ssl/custom/QuasselCertificateManager.kt   |  8 +--
 .../ssl/custom/QuasselHostnameManager.kt      |  8 +--
 .../quasseldroid/ui/chat/ChatActivity.kt      |  8 +--
 .../ui/chat/ChatActivityModule.kt             |  8 +--
 .../ui/chat/ChatFragmentProvider.kt           |  8 +--
 .../quasseldroid/ui/chat/ToolbarFragment.kt   |  8 +--
 .../ui/chat/buffers/BufferListAdapter.kt      |  8 +--
 .../chat/buffers/BufferViewConfigAdapter.kt   |  8 +--
 .../chat/buffers/BufferViewConfigFragment.kt  |  8 +--
 .../chat/info/channel/ChannelInfoActivity.kt  |  8 +--
 .../chat/info/channel/ChannelInfoFragment.kt  |  8 +--
 .../channel/ChannelInfoFragmentProvider.kt    |  8 +--
 .../ui/chat/info/user/UserInfoActivity.kt     |  8 +--
 .../ui/chat/info/user/UserInfoFragment.kt     |  8 +--
 .../info/user/UserInfoFragmentProvider.kt     |  8 +--
 .../ui/chat/input/AutoCompleteAdapter.kt      |  8 +--
 .../ui/chat/input/AutoCompleteHelper.kt       |  8 +--
 .../ui/chat/input/AutoCompletionState.kt      |  8 +--
 .../ui/chat/input/ChatlineFragment.kt         |  8 +--
 .../ui/chat/input/EditorHelper.kt             |  8 +--
 .../ui/chat/input/MessageHistoryAdapter.kt    |  8 +--
 .../ui/chat/input/RichEditText.kt             |  8 +--
 .../quasseldroid/ui/chat/input/RichToolbar.kt |  8 +--
 .../chat/messages/DayChangeItemDecoration.kt  |  8 +--
 .../ui/chat/messages/DisplayMessage.kt        |  8 +--
 .../chat/messages/MarkerLineItemDecoration.kt |  8 +--
 .../ui/chat/messages/MessageAdapter.kt        |  8 +--
 .../ui/chat/messages/MessageListFragment.kt   |  8 +--
 .../ui/chat/messages/MessageRenderer.kt       |  8 +--
 .../chat/messages/QuasselMessageRenderer.kt   |  8 +--
 .../ui/chat/nicks/NickListAdapter.kt          |  8 +--
 .../ui/chat/nicks/NickListFragment.kt         |  8 +--
 .../ui/chat/topic/TopicActivity.kt            |  8 +--
 .../ui/chat/topic/TopicFragment.kt            |  8 +--
 .../ui/chat/topic/TopicFragmentProvider.kt    |  8 +--
 .../ui/clientsettings/about/AboutActivity.kt  |  8 +--
 .../ui/clientsettings/about/AboutFragment.kt  |  8 +--
 .../about/AboutFragmentProvider.kt            |  8 +--
 .../ui/clientsettings/about/Contributor.kt    |  8 +--
 .../about/ContributorAdapter.kt               |  8 +--
 .../ui/clientsettings/about/Library.kt        |  8 +--
 .../ui/clientsettings/about/LibraryAdapter.kt |  8 +--
 .../ui/clientsettings/about/License.kt        |  8 +--
 .../client/ClientSettingsActivity.kt          |  8 +--
 .../client/ClientSettingsFragment.kt          |  8 +--
 .../client/ClientSettingsFragmentProvider.kt  |  8 +--
 .../ui/clientsettings/crash/CrashActivity.kt  |  8 +--
 .../ui/clientsettings/crash/CrashAdapter.kt   |  8 +--
 .../ui/clientsettings/crash/CrashFragment.kt  |  8 +--
 .../crash/CrashFragmentProvider.kt            |  8 +--
 .../clientsettings/license/LicenseActivity.kt |  8 +--
 .../clientsettings/license/LicenseFragment.kt |  8 +--
 .../license/LicenseFragmentProvider.kt        |  8 +--
 .../ui/clientsettings/whitelist/Whitelist.kt  |  8 +--
 .../whitelist/WhitelistActivity.kt            |  8 +--
 .../whitelist/WhitelistCertificateAdapter.kt  |  8 +--
 .../whitelist/WhitelistFragment.kt            |  8 +--
 .../whitelist/WhitelistFragmentProvider.kt    |  8 +--
 .../whitelist/WhitelistHostnameAdapter.kt     |  8 +--
 .../ui/coresettings/CoreSettingsActivity.kt   |  8 +--
 .../ui/coresettings/CoreSettingsFragment.kt   |  8 +--
 .../CoreSettingsFragmentProvider.kt           |  8 +--
 .../ui/coresettings/SettingsFragment.kt       |  8 +--
 .../ui/coresettings/SettingsItem.kt           |  8 +--
 .../ui/coresettings/SettingsItemAdapter.kt    |  8 +--
 .../aliasitem/AliasItemActivity.kt            |  8 +--
 .../aliasitem/AliasItemFragment.kt            |  8 +--
 .../aliasitem/AliasItemFragmentProvider.kt    |  8 +--
 .../aliaslist/AliasListActivity.kt            |  8 +--
 .../aliaslist/AliasListAdapter.kt             |  8 +--
 .../aliaslist/AliasListFragment.kt            |  8 +--
 .../aliaslist/AliasListFragmentProvider.kt    |  8 +--
 .../DragSortItemTouchHelperCallback.kt        |  8 +--
 .../chatlist/ChatListBaseFragment.kt          |  8 +--
 .../chatlist/ChatListCreateFragment.kt        |  8 +--
 .../chatlist/ChatListEditFragment.kt          |  8 +--
 .../chatlist/ChatlistCreateActivity.kt        |  8 +--
 .../ChatlistCreateFragmentProvider.kt         |  8 +--
 .../chatlist/ChatlistEditActivity.kt          |  8 +--
 .../chatlist/ChatlistEditFragmentProvider.kt  |  8 +--
 .../chatlist/MinimumActivityAdapter.kt        |  8 +--
 .../chatlist/MinimumActivityItem.kt           |  8 +--
 .../coresettings/chatlist/NetworkAdapter.kt   |  8 +--
 .../DragSortItemTouchHelperCallback.kt        |  8 +--
 .../highlightlist/HighlightListActivity.kt    |  8 +--
 .../highlightlist/HighlightListFragment.kt    |  8 +--
 .../HighlightListFragmentProvider.kt          |  8 +--
 .../highlightlist/HighlightNickTypeAdapter.kt |  8 +--
 .../highlightlist/HighlightNickTypeItem.kt    |  8 +--
 .../highlightlist/HighlightRuleAdapter.kt     |  8 +--
 .../highlightrule/HighlightRuleActivity.kt    |  8 +--
 .../highlightrule/HighlightRuleFragment.kt    |  8 +--
 .../HighlightRuleFragmentProvider.kt          |  8 +--
 .../DragSortItemTouchHelperCallback.kt        |  8 +--
 .../identity/IdentityBaseFragment.kt          |  8 +--
 .../identity/IdentityCreateActivity.kt        |  8 +--
 .../identity/IdentityCreateFragment.kt        |  8 +--
 .../IdentityCreateFragmentProvider.kt         |  8 +--
 .../identity/IdentityEditActivity.kt          |  8 +--
 .../identity/IdentityEditFragment.kt          |  8 +--
 .../identity/IdentityEditFragmentProvider.kt  |  8 +--
 .../identity/IdentityNicksAdapter.kt          |  8 +--
 .../ignoreitem/IgnoreItemActivity.kt          |  8 +--
 .../ignoreitem/IgnoreItemFragment.kt          |  8 +--
 .../ignoreitem/IgnoreItemFragmentProvider.kt  |  8 +--
 .../ignoreitem/IgnoreTypeAdapter.kt           |  8 +--
 .../coresettings/ignoreitem/IgnoreTypeItem.kt |  8 +--
 .../ignoreitem/ScopeTypeAdapter.kt            |  8 +--
 .../coresettings/ignoreitem/ScopeTypeItem.kt  |  8 +--
 .../ignoreitem/StrictnessTypeAdapter.kt       |  8 +--
 .../ignoreitem/StrictnessTypeItem.kt          |  8 +--
 .../DragSortItemTouchHelperCallback.kt        |  8 +--
 .../ignorelist/IgnoreListActivity.kt          |  8 +--
 .../ignorelist/IgnoreListAdapter.kt           |  8 +--
 .../ignorelist/IgnoreListFragment.kt          |  8 +--
 .../ignorelist/IgnoreListFragmentProvider.kt  |  8 +--
 .../DragSortItemTouchHelperCallback.kt        |  8 +--
 .../coresettings/network/IdentityAdapter.kt   |  8 +--
 .../network/NetworkBaseFragment.kt            |  8 +--
 .../network/NetworkCreateActivity.kt          |  8 +--
 .../network/NetworkCreateFragment.kt          |  8 +--
 .../network/NetworkCreateFragmentProvider.kt  |  8 +--
 .../network/NetworkEditActivity.kt            |  8 +--
 .../network/NetworkEditFragment.kt            |  8 +--
 .../network/NetworkEditFragmentProvider.kt    |  8 +--
 .../network/NetworkServerAdapter.kt           |  8 +--
 .../networkconfig/NetworkConfigActivity.kt    |  8 +--
 .../networkconfig/NetworkConfigFragment.kt    |  8 +--
 .../NetworkConfigFragmentProvider.kt          |  8 +--
 .../networkserver/NetworkServerActivity.kt    |  8 +--
 .../networkserver/NetworkServerFragment.kt    |  8 +--
 .../NetworkServerFragmentProvider.kt          |  8 +--
 .../networkserver/ProxyTypeAdapter.kt         |  8 +--
 .../networkserver/ProxyTypeItem.kt            |  8 +--
 .../quasseldroid/ui/setup/SetupActivity.kt    |  8 +--
 .../quasseldroid/ui/setup/SlideFragment.kt    |  8 +--
 .../ui/setup/ValidityChangeCallback.kt        |  8 +--
 .../accounts/edit/AccountEditActivity.kt      |  8 +--
 .../setup/accounts/edit/AccountEditModule.kt  |  8 +--
 .../accounts/selection/AccountAdapter.kt      |  8 +--
 .../selection/AccountSelectionActivity.kt     |  8 +--
 .../AccountSelectionFragmentProvider.kt       |  8 +--
 .../selection/AccountSelectionSlide.kt        |  8 +--
 .../accounts/selection/AccountViewModel.kt    |  8 +--
 .../accounts/setup/AccountSetupActivity.kt    |  8 +--
 .../setup/AccountSetupConnectionSlide.kt      |  8 +--
 .../setup/AccountSetupFragmentProvider.kt     |  8 +--
 .../accounts/setup/AccountSetupNameSlide.kt   |  8 +--
 .../accounts/setup/AccountSetupUserSlide.kt   |  8 +--
 .../quasseldroid/util/AndroidHandlerThread.kt |  8 +--
 .../kuschku/quasseldroid/util/AvatarHelper.kt |  8 +--
 .../de/kuschku/quasseldroid/util/Patterns.kt  |  8 +--
 .../util/QuasseldroidNotificationManager.kt   |  8 +--
 .../quasseldroid/util/TextValidator.kt        |  8 +--
 .../util/backport/AndroidThreeTenBackport.kt  |  8 +--
 .../util/backport/DaggerLifecycleService.kt   |  8 +--
 .../DaggerPreferenceFragmentCompat.kt         |  8 +--
 .../util/backport/ReadableWrappedChannel.kt   |  8 +--
 .../util/backport/WritableWrappedChannel.kt   |  8 +--
 .../AndroidCompatibilityUtils.kt              |  8 +--
 .../compatibility/AndroidHandlerService.kt    |  8 +--
 .../compatibility/AndroidLoggingHandler.kt    |  8 +--
 .../AndroidStreamChannelFactory.kt            |  8 +--
 .../util/helper/AccountDaoHelper.kt           |  8 +--
 .../util/helper/ActivityHelper.kt             |  8 +--
 .../quasseldroid/util/helper/AnyHelper.kt     |  8 +--
 .../quasseldroid/util/helper/BooleanHelper.kt |  8 +--
 .../quasseldroid/util/helper/ButtonHelper.kt  |  8 +--
 .../util/helper/CharSequenceHelper.kt         |  8 +--
 .../quasseldroid/util/helper/ContextHelper.kt |  8 +--
 .../util/helper/DrawableHelper.kt             |  8 +--
 .../util/helper/EditableHelper.kt             |  8 +--
 .../util/helper/FloatingActionButtonHelper.kt |  8 +--
 .../quasseldroid/util/helper/GlideHelper.kt   |  8 +--
 .../quasseldroid/util/helper/GsonHelper.kt    |  8 +--
 .../util/helper/IntProgressionHelper.kt       |  8 +--
 .../util/helper/IntRangeHelper.kt             |  8 +--
 .../quasseldroid/util/helper/ListHelper.kt    |  8 +--
 .../util/helper/LruCacheHelper.kt             |  8 +--
 .../quasseldroid/util/helper/MenuHelper.kt    |  8 +--
 .../util/helper/ResourcesHelper.kt            |  8 +--
 .../util/helper/SelectionHelper.kt            |  8 +--
 .../util/helper/SharedPreferencesHelper.kt    |  8 +--
 .../quasseldroid/util/helper/SpannedHelper.kt |  8 +--
 .../util/helper/SwitchCompatHelper.kt         |  8 +--
 .../quasseldroid/util/helper/ThemeHelper.kt   |  8 +--
 .../quasseldroid/util/helper/ViewHelper.kt    |  8 +--
 .../util/helper/X509CertificateHelper.kt      |  8 +--
 .../util/irc/format/ContentFormatter.kt       |  8 +--
 .../util/irc/format/IrcFormatDeserializer.kt  |  8 +--
 .../util/irc/format/IrcFormatSerializer.kt    |  8 +--
 .../util/irc/format/spans/Copyable.kt         |  8 +--
 .../format/spans/IrcBackgroundColorSpan.kt    |  8 +--
 .../util/irc/format/spans/IrcBoldSpan.kt      |  8 +--
 .../format/spans/IrcForegroundColorSpan.kt    |  8 +--
 .../util/irc/format/spans/IrcItalicSpan.kt    |  8 +--
 .../util/irc/format/spans/IrcMonospaceSpan.kt |  8 +--
 .../irc/format/spans/IrcStrikethroughSpan.kt  |  8 +--
 .../util/irc/format/spans/IrcUnderlineSpan.kt |  8 +--
 .../util/service/BackendServiceConnection.kt  |  8 +--
 .../util/service/ServiceBoundActivity.kt      |  8 +--
 .../util/service/ServiceBoundFragment.kt      |  8 +--
 .../quasseldroid/util/ui/AnimationHelper.kt   |  8 +--
 .../util/ui/AutoCompleteRecyclerView.kt       |  8 +--
 .../util/ui/BetterLinkMovementMethod.java     | 22 ++++++++
 .../util/ui/ColorChooserDialog.java           |  8 +--
 .../util/ui/ContextThemeWrapper.kt            |  8 +--
 .../quasseldroid/util/ui/DoubleClickHelper.kt |  8 +--
 .../util/ui/DrawerRecyclerView.kt             |  8 +--
 .../util/ui/EditTextSelectionChange.kt        |  8 +--
 .../util/ui/LinkLongClickMenuHelper.kt        |  8 +--
 .../util/ui/RecyclerSpinnerAdapter.kt         |  8 +--
 .../util/ui/RipplePassthroughTextView.kt      |  8 +--
 .../util/ui/ServiceBoundSettingsActivity.kt   |  8 +--
 .../quasseldroid/util/ui/SettingsActivity.kt  |  8 +--
 .../quasseldroid/util/ui/TextDrawable.java    |  8 +--
 .../quasseldroid/util/ui/ThemedActivity.kt    |  8 +--
 app/src/main/res/drawable-ldrtl/ic_send.xml   | 38 +++++++-------
 .../res/drawable-v21/bg_menuitem_dark.xml     | 38 +++++++-------
 .../res/drawable-v21/bg_menuitem_light.xml    | 38 +++++++-------
 .../drawable-v21/bg_menuitem_rounded_dark.xml | 38 +++++++-------
 .../bg_menuitem_rounded_light.xml             | 38 +++++++-------
 .../drawable-v26/ic_launcher_background.xml   | 38 +++++++-------
 app/src/main/res/drawable/bg_badge.xml        | 38 +++++++-------
 app/src/main/res/drawable/bg_intro.xml        | 38 +++++++-------
 .../main/res/drawable/bg_menuitem_dark.xml    | 38 +++++++-------
 .../main/res/drawable/bg_menuitem_light.xml   | 38 +++++++-------
 .../res/drawable/bg_menuitem_rounded_dark.xml | 38 +++++++-------
 .../drawable/bg_menuitem_rounded_light.xml    | 38 +++++++-------
 app/src/main/res/drawable/bg_splash.xml       | 38 +++++++-------
 app/src/main/res/drawable/bg_transparent.xml  | 38 +++++++-------
 app/src/main/res/drawable/ic_account.xml      | 38 +++++++-------
 app/src/main/res/drawable/ic_account_card.xml | 38 +++++++-------
 .../main/res/drawable/ic_account_minus.xml    | 38 +++++++-------
 .../main/res/drawable/ic_account_multiple.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_account_plus.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_add.xml          | 38 +++++++-------
 app/src/main/res/drawable/ic_arrow_right.xml  | 38 +++++++-------
 app/src/main/res/drawable/ic_bell.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_check.xml        | 38 +++++++-------
 app/src/main/res/drawable/ic_chevron_down.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_chevron_up.xml   | 38 +++++++-------
 app/src/main/res/drawable/ic_clock.xml        | 38 +++++++-------
 app/src/main/res/drawable/ic_close.xml        | 38 +++++++-------
 app/src/main/res/drawable/ic_copy.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_debug.xml        | 38 +++++++-------
 app/src/main/res/drawable/ic_delete.xml       | 38 +++++++-------
 app/src/main/res/drawable/ic_eye.xml          | 38 +++++++-------
 app/src/main/res/drawable/ic_eye_off.xml      | 38 +++++++-------
 app/src/main/res/drawable/ic_filter.xml       | 38 +++++++-------
 .../res/drawable/ic_format_background.xml     | 38 +++++++-------
 app/src/main/res/drawable/ic_format_bold.xml  | 38 +++++++-------
 app/src/main/res/drawable/ic_format_clear.xml | 38 +++++++-------
 .../res/drawable/ic_format_foreground.xml     | 38 +++++++-------
 .../main/res/drawable/ic_format_italic.xml    | 38 +++++++-------
 .../main/res/drawable/ic_format_monospace.xml | 38 +++++++-------
 .../res/drawable/ic_format_strikethrough.xml  | 38 +++++++-------
 .../main/res/drawable/ic_format_underline.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_help.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_history.xml      | 38 +++++++-------
 app/src/main/res/drawable/ic_info.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_key_variant.xml  | 38 +++++++-------
 .../main/res/drawable/ic_list_bulleted.xml    | 38 +++++++-------
 app/src/main/res/drawable/ic_lock.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_lock_open.xml    | 38 +++++++-------
 .../main/res/drawable/ic_message_bulleted.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_modify.xml       | 38 +++++++-------
 app/src/main/res/drawable/ic_pencil.xml       | 38 +++++++-------
 app/src/main/res/drawable/ic_reorder.xml      | 38 +++++++-------
 app/src/main/res/drawable/ic_save.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_scroll_down.xml  | 38 +++++++-------
 app/src/main/res/drawable/ic_send.xml         | 38 +++++++-------
 app/src/main/res/drawable/ic_server.xml       | 38 +++++++-------
 .../main/res/drawable/ic_server_network.xml   | 38 +++++++-------
 app/src/main/res/drawable/ic_settings.xml     | 38 +++++++-------
 app/src/main/res/drawable/ic_share.xml        | 38 +++++++-------
 .../res/drawable/ic_share_alternative.xml     | 38 +++++++-------
 .../main/res/drawable/ic_shortcut_channel.xml | 38 +++++++-------
 .../ic_shortcut_channel_foreground.xml        | 38 +++++++-------
 .../main/res/drawable/ic_shortcut_query.xml   | 38 +++++++-------
 .../drawable/ic_shortcut_query_foreground.xml | 38 +++++++-------
 app/src/main/res/drawable/ic_status.xml       | 38 +++++++-------
 .../main/res/drawable/ic_status_channel.xml   | 38 +++++++-------
 .../drawable/ic_status_channel_offline.xml    | 38 +++++++-------
 .../main/res/drawable/ic_status_offline.xml   | 38 +++++++-------
 app/src/main/res/drawable/ic_tab.xml          | 38 +++++++-------
 app/src/main/res/drawable/ic_tag_text.xml     | 38 +++++++-------
 app/src/main/res/layout-land/layout_main.xml  | 38 +++++++-------
 .../layout-sw600dp-land/activity_setup.xml    | 38 +++++++-------
 .../res/layout-sw600dp-land/layout_main.xml   | 38 +++++++-------
 .../res/layout-sw600dp-land/setup_slide.xml   | 38 +++++++-------
 .../res/layout-sw600dp/activity_setup.xml     | 38 +++++++-------
 .../main/res/layout-sw600dp/setup_slide.xml   | 38 +++++++-------
 .../res/layout-sw720dp-land/activity_main.xml | 38 +++++++-------
 .../res/layout-sw720dp/activity_settings.xml  | 38 +++++++-------
 app/src/main/res/layout/activity_main.xml     | 38 +++++++-------
 app/src/main/res/layout/activity_settings.xml | 38 +++++++-------
 app/src/main/res/layout/activity_setup.xml    | 38 +++++++-------
 .../main/res/layout/dialog_colorchooser.xml   | 38 +++++++-------
 .../res/layout/dialog_colorchooser_custom.xml | 38 +++++++-------
 .../layout/dialog_colorchooser_presets.xml    | 38 +++++++-------
 .../main/res/layout/fragment_chat_list.xml    | 38 +++++++-------
 app/src/main/res/layout/fragment_chatline.xml | 38 +++++++-------
 .../main/res/layout/fragment_info_channel.xml | 38 +++++++-------
 .../main/res/layout/fragment_info_user.xml    | 38 +++++++-------
 app/src/main/res/layout/fragment_messages.xml | 38 +++++++-------
 .../main/res/layout/fragment_nick_list.xml    | 38 +++++++-------
 app/src/main/res/layout/fragment_toolbar.xml  | 38 +++++++-------
 app/src/main/res/layout/fragment_topic.xml    | 38 +++++++-------
 app/src/main/res/layout/layout_editor.xml     | 38 +++++++-------
 app/src/main/res/layout/layout_history.xml    | 38 +++++++-------
 app/src/main/res/layout/layout_main.xml       | 38 +++++++-------
 app/src/main/res/layout/layout_toolbar.xml    | 38 +++++++-------
 .../main/res/layout/preference_vertical.xml   | 38 +++++++-------
 app/src/main/res/layout/preferences_about.xml | 38 +++++++-------
 .../res/layout/preferences_about_header.xml   | 52 +++++++++----------
 app/src/main/res/layout/preferences_crash.xml | 38 +++++++-------
 .../main/res/layout/preferences_license.xml   | 38 +++++++-------
 .../main/res/layout/preferences_whitelist.xml | 38 +++++++-------
 ...preferences_whitelist_certificate_item.xml | 38 +++++++-------
 .../preferences_whitelist_hostname_item.xml   | 38 +++++++-------
 .../main/res/layout/settings_aliasitem.xml    | 38 +++++++-------
 .../main/res/layout/settings_aliaslist.xml    | 38 +++++++-------
 .../res/layout/settings_aliaslist_item.xml    | 38 +++++++-------
 app/src/main/res/layout/settings_chatlist.xml | 38 +++++++-------
 .../res/layout/settings_highlightlist.xml     | 38 +++++++-------
 .../layout/settings_highlightlist_rule.xml    | 38 +++++++-------
 .../res/layout/settings_highlightrule.xml     | 38 +++++++-------
 app/src/main/res/layout/settings_identity.xml | 38 +++++++-------
 .../res/layout/settings_identity_nick.xml     | 38 +++++++-------
 .../main/res/layout/settings_ignoreitem.xml   | 38 +++++++-------
 .../main/res/layout/settings_ignorelist.xml   | 38 +++++++-------
 .../res/layout/settings_ignorelist_item.xml   | 38 +++++++-------
 app/src/main/res/layout/settings_item.xml     | 38 +++++++-------
 app/src/main/res/layout/settings_list.xml     | 38 +++++++-------
 app/src/main/res/layout/settings_network.xml  | 38 +++++++-------
 .../res/layout/settings_network_server.xml    | 38 +++++++-------
 .../res/layout/settings_networkconfig.xml     | 38 +++++++-------
 .../res/layout/settings_networkserver.xml     | 38 +++++++-------
 .../res/layout/setup_account_connection.xml   | 38 +++++++-------
 .../main/res/layout/setup_account_edit.xml    | 38 +++++++-------
 .../main/res/layout/setup_account_name.xml    | 38 +++++++-------
 .../main/res/layout/setup_account_user.xml    | 38 +++++++-------
 .../main/res/layout/setup_select_account.xml  | 38 +++++++-------
 app/src/main/res/layout/setup_slide.xml       | 38 +++++++-------
 app/src/main/res/layout/widget_buffer.xml     | 40 +++++++-------
 .../res/layout/widget_chatmessage_action.xml  | 38 +++++++-------
 .../layout/widget_chatmessage_daychange.xml   | 38 +++++++-------
 .../res/layout/widget_chatmessage_error.xml   | 38 +++++++-------
 .../res/layout/widget_chatmessage_info.xml    | 38 +++++++-------
 .../res/layout/widget_chatmessage_notice.xml  | 38 +++++++-------
 .../layout/widget_chatmessage_placeholder.xml | 38 +++++++-------
 .../res/layout/widget_chatmessage_plain.xml   | 38 +++++++-------
 .../res/layout/widget_chatmessage_server.xml  | 38 +++++++-------
 .../main/res/layout/widget_contributor.xml    | 38 +++++++-------
 .../main/res/layout/widget_core_account.xml   | 38 +++++++-------
 .../res/layout/widget_core_account_add.xml    | 38 +++++++-------
 app/src/main/res/layout/widget_crash.xml      | 38 +++++++-------
 app/src/main/res/layout/widget_formatting.xml | 38 +++++++-------
 .../res/layout/widget_history_message.xml     | 38 +++++++-------
 app/src/main/res/layout/widget_library.xml    | 38 +++++++-------
 app/src/main/res/layout/widget_network.xml    | 38 +++++++-------
 app/src/main/res/layout/widget_nick.xml       | 38 +++++++-------
 app/src/main/res/layout/widget_nick_away.xml  | 38 +++++++-------
 .../res/layout/widget_spinner_item_inline.xml | 38 +++++++-------
 .../layout/widget_spinner_item_toolbar.xml    | 38 +++++++-------
 app/src/main/res/menu/activity_crashes.xml    | 38 +++++++-------
 app/src/main/res/menu/activity_main.xml       | 38 +++++++-------
 app/src/main/res/menu/activity_settings.xml   | 38 +++++++-------
 app/src/main/res/menu/activity_setup.xml      | 38 +++++++-------
 app/src/main/res/menu/context_buffer.xml      | 38 +++++++-------
 app/src/main/res/menu/context_bufferlist.xml  | 38 +++++++-------
 app/src/main/res/menu/context_link.xml        | 38 +++++++-------
 app/src/main/res/menu/context_messages.xml    | 38 +++++++-------
 app/src/main/res/menu/context_setting.xml     | 38 +++++++-------
 app/src/main/res/menu/editor.xml              | 38 +++++++-------
 app/src/main/res/menu/setup_edit_account.xml  | 38 +++++++-------
 .../res/mipmap-anydpi-v26/ic_launcher.xml     | 38 +++++++-------
 app/src/main/res/raw/keep.xml                 | 38 +++++++-------
 app/src/main/res/values-de/strings.xml        | 42 +++++++--------
 .../res/values-de/strings_contributors.xml    | 38 +++++++-------
 app/src/main/res/values-de/strings_error.xml  | 38 +++++++-------
 app/src/main/res/values-de/strings_format.xml | 38 +++++++-------
 app/src/main/res/values-de/strings_info.xml   | 38 +++++++-------
 .../main/res/values-de/strings_messages.xml   | 38 +++++++-------
 .../res/values-de/strings_preferences.xml     | 40 +++++++-------
 .../main/res/values-de/strings_settings.xml   | 38 +++++++-------
 app/src/main/res/values-de/strings_setup.xml  | 38 +++++++-------
 app/src/main/res/values-de/strings_status.xml | 38 +++++++-------
 app/src/main/res/values-large/dimens.xml      | 38 +++++++-------
 app/src/main/res/values-sw600dp/dimens.xml    | 38 +++++++-------
 .../main/res/values-sw600dp/themes_base.xml   | 38 +++++++-------
 .../main/res/values-sw720dp-land/bools.xml    | 38 +++++++-------
 .../main/res/values-v17/styles_widgets.xml    | 38 +++++++-------
 app/src/main/res/values-v21/themes_base.xml   | 38 +++++++-------
 app/src/main/res/values/attrs.xml             | 38 +++++++-------
 app/src/main/res/values/bools.xml             | 38 +++++++-------
 app/src/main/res/values/colors.xml            | 38 +++++++-------
 app/src/main/res/values/defaults.xml          | 38 +++++++-------
 app/src/main/res/values/dimens.xml            | 38 +++++++-------
 app/src/main/res/values/ids.xml               | 38 +++++++-------
 app/src/main/res/values/strings.xml           | 42 +++++++--------
 .../main/res/values/strings_contributors.xml  | 38 +++++++-------
 app/src/main/res/values/strings_error.xml     | 38 +++++++-------
 app/src/main/res/values/strings_format.xml    | 38 +++++++-------
 app/src/main/res/values/strings_info.xml      | 38 +++++++-------
 app/src/main/res/values/strings_licenses.xml  | 38 +++++++-------
 app/src/main/res/values/strings_messages.xml  | 38 +++++++-------
 .../main/res/values/strings_preferences.xml   | 40 +++++++-------
 app/src/main/res/values/strings_settings.xml  | 38 +++++++-------
 app/src/main/res/values/strings_setup.xml     | 38 +++++++-------
 app/src/main/res/values/strings_status.xml    | 38 +++++++-------
 app/src/main/res/values/styles_widgets.xml    | 38 +++++++-------
 app/src/main/res/values/themes_amoled.xml     | 38 +++++++-------
 app/src/main/res/values/themes_base.xml       | 38 +++++++-------
 app/src/main/res/values/themes_dracula.xml    | 38 +++++++-------
 app/src/main/res/values/themes_gruvbox.xml    | 38 +++++++-------
 app/src/main/res/values/themes_material.xml   | 38 +++++++-------
 app/src/main/res/values/themes_quassel.xml    | 38 +++++++-------
 app/src/main/res/values/themes_solarized.xml  | 38 +++++++-------
 app/src/main/res/xml/backup_content.xml       | 23 +++++++-
 app/src/main/res/xml/preferences.xml          | 38 +++++++-------
 .../quasseldroid/util/AvatarHelperTest.kt     |  8 +--
 build.gradle                                  | 22 ++++++++
 buildSrc/build.gradle.kts                     | 27 ++++++++--
 buildSrc/src/main/kotlin/ProjectHelper.kt     | 27 ++++++++--
 buildSrc/src/main/kotlin/VersionContext.kt    | 27 ++++++++--
 gradle.properties                             | 10 ++--
 gradle/wrapper/gradle-wrapper.properties      | 19 +++++++
 .../kuschku/libquassel/annotations/Slot.java  |  8 +--
 .../libquassel/annotations/Syncable.java      |  8 +--
 invokergenerator/build.gradle.kts             | 27 ++++++++--
 .../annotations/InvokerProcessor.java         |  8 +--
 lib/build.gradle.kts                          | 27 ++++++++--
 .../libquassel/connection/ConnectionState.kt  |  8 +--
 .../libquassel/connection/CoreConnection.kt   |  8 +--
 .../kuschku/libquassel/connection/Features.kt |  8 +--
 .../libquassel/connection/HostnameVerifier.kt |  8 +--
 .../libquassel/connection/MessageRunnable.kt  |  8 +--
 .../connection/QuasselSecurityException.kt    |  8 +--
 .../libquassel/connection/SocketAddress.kt    |  8 +--
 .../kuschku/libquassel/protocol/ClientData.kt |  8 +--
 .../de/kuschku/libquassel/protocol/Message.kt |  8 +--
 .../protocol/NetworkLayerProtocol.kt          |  8 +--
 .../kuschku/libquassel/protocol/Protocol.kt   |  8 +--
 .../de/kuschku/libquassel/protocol/QType.kt   |  8 +--
 .../de/kuschku/libquassel/protocol/QTypes.kt  |  8 +--
 .../kuschku/libquassel/protocol/QVariant.kt   |  8 +--
 .../de/kuschku/libquassel/protocol/Type.kt    |  8 +--
 .../message/ClientInitAckSerializer.kt        |  8 +--
 .../message/ClientInitRejectSerializer.kt     |  8 +--
 .../protocol/message/ClientInitSerializer.kt  |  8 +--
 .../message/ClientLoginAckSerializer.kt       |  8 +--
 .../message/ClientLoginRejectSerializer.kt    |  8 +--
 .../protocol/message/ClientLoginSerializer.kt |  8 +--
 .../message/CoreSetupAckSerializer.kt         |  8 +--
 .../message/CoreSetupDataSerializer.kt        |  8 +--
 .../message/CoreSetupRejectSerializer.kt      |  8 +--
 .../protocol/message/HandshakeMessage.kt      |  8 +--
 .../message/HandshakeMessageSerializer.kt     |  8 +--
 .../message/HeartBeatReplySerializer.kt       |  8 +--
 .../protocol/message/HeartBeatSerializer.kt   |  8 +--
 .../protocol/message/InitDataSerializer.kt    |  8 +--
 .../protocol/message/InitRequestSerializer.kt |  8 +--
 .../protocol/message/RequestType.kt           |  8 +--
 .../protocol/message/RpcCallSerializer.kt     |  8 +--
 .../protocol/message/SessionInitSerializer.kt |  8 +--
 .../protocol/message/SignalProxyMessage.kt    |  8 +--
 .../message/SignalProxyMessageSerializer.kt   |  8 +--
 .../protocol/message/SyncMessageSerializer.kt |  8 +--
 .../primitive/serializer/BoolSerializer.kt    |  8 +--
 .../serializer/BufferInfoSerializer.kt        |  8 +--
 .../serializer/ByteArraySerializer.kt         |  8 +--
 .../primitive/serializer/ByteSerializer.kt    |  8 +--
 .../primitive/serializer/CharSerializer.kt    |  8 +--
 .../serializer/DateTimeSerializer.kt          |  8 +--
 .../DccConfig_IpDetectionModeSerializer.kt    |  8 +--
 .../DccConfig_PortSelectionModeSerializer.kt  |  8 +--
 .../HandshakeVariantMapSerializer.kt          |  8 +--
 .../serializer/HostAddressSerializer.kt       |  8 +--
 .../primitive/serializer/IntSerializer.kt     |  8 +--
 .../primitive/serializer/LongSerializer.kt    |  8 +--
 .../primitive/serializer/MessageSerializer.kt |  8 +--
 .../serializer/ProtocolInfoSerializer.kt      |  8 +--
 .../primitive/serializer/ShortSerializer.kt   |  8 +--
 .../serializer/StringListSerializer.kt        |  8 +--
 .../primitive/serializer/StringSerializer.kt  |  8 +--
 .../primitive/serializer/TimeSerializer.kt    |  8 +--
 .../serializer/VariantListSerializer.kt       |  8 +--
 .../serializer/VariantMapSerializer.kt        |  8 +--
 .../primitive/serializer/VariantSerializer.kt |  8 +--
 .../primitive/serializer/VoidSerializer.kt    |  8 +--
 .../kuschku/libquassel/quassel/BufferInfo.kt  |  8 +--
 .../libquassel/quassel/ExtendedFeature.kt     |  8 +--
 .../libquassel/quassel/LegacyFeature.kt       |  8 +--
 .../libquassel/quassel/ProtocolFeature.kt     |  8 +--
 .../libquassel/quassel/ProtocolInfo.kt        |  8 +--
 .../libquassel/quassel/QuasselFeatures.kt     |  8 +--
 .../exceptions/DeserializationException.kt    |  8 +--
 .../exceptions/MessageHandlingException.kt    |  8 +--
 .../exceptions/ObjectNotFoundException.kt     |  8 +--
 .../quassel/exceptions/QuasselException.kt    |  8 +--
 .../exceptions/UnknownMethodException.kt      |  8 +--
 .../exceptions/WrongObjectTypeException.kt    |  8 +--
 .../quassel/syncables/AliasManager.kt         |  8 +--
 .../quassel/syncables/BacklogManager.kt       |  8 +--
 .../quassel/syncables/BufferSyncer.kt         |  8 +--
 .../quassel/syncables/BufferViewConfig.kt     |  8 +--
 .../quassel/syncables/BufferViewManager.kt    |  8 +--
 .../quassel/syncables/CertManager.kt          |  8 +--
 .../libquassel/quassel/syncables/CoreInfo.kt  |  8 +--
 .../libquassel/quassel/syncables/DccConfig.kt |  8 +--
 .../quassel/syncables/HighlightRuleManager.kt |  8 +--
 .../libquassel/quassel/syncables/Identity.kt  |  8 +--
 .../quassel/syncables/IgnoreListManager.kt    |  8 +--
 .../quassel/syncables/IrcChannel.kt           |  8 +--
 .../quassel/syncables/IrcListHelper.kt        |  8 +--
 .../libquassel/quassel/syncables/IrcUser.kt   |  8 +--
 .../libquassel/quassel/syncables/Network.kt   |  8 +--
 .../quassel/syncables/NetworkConfig.kt        |  8 +--
 .../quassel/syncables/RpcHandler.kt           |  8 +--
 .../quassel/syncables/SyncableObject.kt       |  8 +--
 .../syncables/interfaces/IAliasManager.kt     |  8 +--
 .../syncables/interfaces/IBacklogManager.kt   |  8 +--
 .../syncables/interfaces/IBufferSyncer.kt     |  8 +--
 .../syncables/interfaces/IBufferViewConfig.kt |  8 +--
 .../interfaces/IBufferViewManager.kt          |  8 +--
 .../syncables/interfaces/ICertManager.kt      |  8 +--
 .../quassel/syncables/interfaces/ICoreInfo.kt |  8 +--
 .../syncables/interfaces/IDccConfig.kt        |  8 +--
 .../interfaces/IHighlightRuleManager.kt       |  8 +--
 .../quassel/syncables/interfaces/IIdentity.kt |  8 +--
 .../interfaces/IIgnoreListManager.kt          |  8 +--
 .../syncables/interfaces/IIrcChannel.kt       |  8 +--
 .../syncables/interfaces/IIrcListHelper.kt    |  8 +--
 .../quassel/syncables/interfaces/IIrcUser.kt  |  8 +--
 .../quassel/syncables/interfaces/INetwork.kt  |  8 +--
 .../syncables/interfaces/INetworkConfig.kt    |  8 +--
 .../syncables/interfaces/IRpcHandler.kt       |  8 +--
 .../syncables/interfaces/ISyncableObject.kt   |  8 +--
 .../quassel/syncables/interfaces/ITransfer.kt |  8 +--
 .../syncables/interfaces/ITransferManager.kt  |  8 +--
 .../syncables/interfaces/invokers/Invoker.kt  |  8 +--
 .../syncables/interfaces/invokers/Invokers.kt |  8 +--
 .../kuschku/libquassel/session/AuthHandler.kt |  8 +--
 .../de/kuschku/libquassel/session/Backend.kt  |  8 +--
 .../libquassel/session/BacklogStorage.kt      |  8 +--
 .../de/kuschku/libquassel/session/Error.kt    |  8 +--
 .../de/kuschku/libquassel/session/ISession.kt |  8 +--
 .../libquassel/session/ObjectStorage.kt       |  8 +--
 .../libquassel/session/ProtocolHandler.kt     |  8 +--
 .../de/kuschku/libquassel/session/Session.kt  |  8 +--
 .../libquassel/session/SessionManager.kt      |  8 +--
 .../kuschku/libquassel/session/SignalProxy.kt |  8 +--
 .../de/kuschku/libquassel/util/CRCUtils.kt    |  8 +--
 .../libquassel/util/GlobTransformer.kt        |  8 +--
 .../kuschku/libquassel/util/IrcUserUtils.kt   |  8 +--
 .../de/kuschku/libquassel/util/Optional.kt    |  8 +--
 .../util/compatibility/CompatibilityUtils.kt  |  8 +--
 .../util/compatibility/HandlerService.kt      |  8 +--
 .../util/compatibility/LoggingHandler.kt      |  8 +--
 .../compatibility/StreamChannelFactory.kt     |  8 +--
 .../reference/JavaHandlerService.kt           |  8 +--
 .../reference/JavaLoggingHandler.kt           |  8 +--
 .../reference/JavaStreamChannelFactory.kt     |  8 +--
 .../de/kuschku/libquassel/util/flag/Flag.kt   |  8 +--
 .../kuschku/libquassel/util/flag/LongFlag.kt  |  8 +--
 .../kuschku/libquassel/util/flag/ShortFlag.kt |  8 +--
 .../libquassel/util/helpers/ArrayHelper.kt    |  8 +--
 .../util/helpers/ByteBufferHelper.kt          |  8 +--
 .../libquassel/util/helpers/MapHelper.kt      |  8 +--
 .../libquassel/util/helpers/MathHelper.kt     | 27 ++++++++--
 .../util/helpers/ObservableHelper.kt          |  8 +--
 .../libquassel/util/helpers/StringHelper.kt   |  8 +--
 .../util/helpers/WritableByteChannelHelper.kt |  8 +--
 .../libquassel/util/irc/HostmaskHelper.kt     |  8 +--
 .../libquassel/util/irc/IrcCaseMappers.kt     |  8 +--
 .../libquassel/util/nio/ChainedByteBuffer.kt  |  8 +--
 .../libquassel/util/nio/WrappedChannel.kt     |  8 +--
 .../serializer/BoolSerializerTest.kt          |  8 +--
 .../serializer/BufferInfoSerializerTest.kt    |  8 +--
 .../serializer/ByteArraySerializerTest.kt     |  8 +--
 .../serializer/ByteSerializerTest.kt          |  8 +--
 .../serializer/CharSerializerTest.kt          |  8 +--
 .../serializer/DateTimeSerializerTest.kt      |  8 +--
 .../primitive/serializer/IntSerializerTest.kt |  8 +--
 .../serializer/LongSerializerTest.kt          |  8 +--
 .../serializer/MessageSerializerTest.kt       |  8 +--
 .../serializer/ShortSerializerTest.kt         |  8 +--
 .../serializer/StringSerializerTest.kt        |  8 +--
 .../quassel/syncables/AliasManagerTest.kt     |  8 +--
 .../quassel/syncables/BufferViewConfigTest.kt |  8 +--
 .../syncables/HighlightRuleManagerTest.kt     |  8 +--
 .../quassel/syncables/IdentityTest.kt         |  8 +--
 .../syncables/IgnoreListManagerTest.kt        |  8 +--
 .../quassel/syncables/NetworkConfigTest.kt    |  8 +--
 .../quassel/syncables/NetworkTest.kt          |  8 +--
 .../syncables/interfaces/INetworkInfoTest.kt  |  8 +--
 .../kuschku/libquassel/util/RandomHelpers.kt  |  8 +--
 .../libquassel/util/SerializerHelpers.kt      |  8 +--
 lib/src/test/resources/logging.properties     | 10 ++--
 lint.xml                                      | 22 ++++++++
 malheur/build.gradle.kts                      | 27 ++++++++--
 malheur/src/main/AndroidManifest.xml          | 38 +++++++-------
 .../java/de/kuschku/malheur/CrashContext.kt   |  8 +--
 .../java/de/kuschku/malheur/CrashHandler.kt   |  8 +--
 .../malheur/collectors/AppCollector.kt        |  8 +--
 .../kuschku/malheur/collectors/Collector.kt   |  8 +--
 .../collectors/ConfigurationCollector.kt      |  8 +--
 .../malheur/collectors/CrashCollector.kt      |  8 +--
 .../malheur/collectors/DeviceCollector.kt     |  8 +--
 .../malheur/collectors/DisplayCollector.kt    |  8 +--
 .../malheur/collectors/EnvCollector.kt        |  8 +--
 .../malheur/collectors/LogCollector.kt        |  8 +--
 .../malheur/collectors/ReportCollector.kt     |  8 +--
 .../malheur/collectors/ThreadCollector.kt     |  8 +--
 .../de/kuschku/malheur/config/AppConfig.kt    |  8 +--
 .../de/kuschku/malheur/config/CrashConfig.kt  |  8 +--
 .../de/kuschku/malheur/config/DeviceConfig.kt |  8 +--
 .../de/kuschku/malheur/config/EnvConfig.kt    |  8 +--
 .../de/kuschku/malheur/config/LogConfig.kt    |  8 +--
 .../de/kuschku/malheur/config/ReportConfig.kt |  8 +--
 .../de/kuschku/malheur/config/ThreadConfig.kt |  8 +--
 .../java/de/kuschku/malheur/data/AppInfo.kt   |  8 +--
 .../java/de/kuschku/malheur/data/CrashInfo.kt |  8 +--
 .../de/kuschku/malheur/data/DeviceInfo.kt     |  8 +--
 .../de/kuschku/malheur/data/DisplayInfo.kt    |  8 +--
 .../java/de/kuschku/malheur/data/EnvInfo.kt   |  8 +--
 .../de/kuschku/malheur/data/ExceptionInfo.kt  |  8 +--
 .../de/kuschku/malheur/data/MemoryInfo.kt     |  8 +--
 .../de/kuschku/malheur/data/MetricsInfo.kt    |  8 +--
 .../java/de/kuschku/malheur/data/Report.kt    |  8 +--
 .../de/kuschku/malheur/data/ThreadInfo.kt     |  8 +--
 .../de/kuschku/malheur/data/ThreadsInfo.kt    |  8 +--
 .../de/kuschku/malheur/data/TraceElement.kt   |  8 +--
 .../de/kuschku/malheur/util/DisplayHelper.kt  |  8 +--
 .../kuschku/malheur/util/ReflectionHelper.kt  |  8 +--
 persistence/build.gradle.kts                  | 27 ++++++++--
 persistence/src/main/AndroidManifest.xml      | 38 +++++++-------
 .../persistence/AccountDatabase.kt            |  8 +--
 .../persistence/QuasselBacklogStorage.kt      |  8 +--
 .../persistence/QuasselDatabase.kt            |  8 +--
 settings.gradle                               | 22 ++++++++
 slidingpanel/src/main/AndroidManifest.xml     | 23 +++++++-
 .../slidinguppanel/ScrollableViewHelper.java  | 22 ++++++++
 .../slidinguppanel/SlidingUpPanelLayout.java  |  8 +--
 .../src/main/res/drawable/above_shadow.xml    | 25 ++++++++-
 .../src/main/res/drawable/below_shadow.xml    | 25 ++++++++-
 slidingpanel/src/main/res/values/attrs.xml    | 23 +++++++-
 viewmodel/build.gradle.kts                    | 27 ++++++++--
 viewmodel/src/main/AndroidManifest.xml        | 38 +++++++-------
 .../util/helper/LiveDataHelper.kt             |  8 +--
 .../util/helper/ObservableHelper.kt           |  8 +--
 .../quasseldroid/viewmodel/EditorViewModel.kt |  8 +--
 .../viewmodel/QuasselViewModel.kt             |  8 +--
 .../viewmodel/data/AutoCompleteItem.kt        |  8 +--
 .../quasseldroid/viewmodel/data/BufferData.kt |  8 +--
 .../viewmodel/data/BufferHiddenState.kt       |  8 +--
 .../viewmodel/data/BufferListItem.kt          |  8 +--
 .../viewmodel/data/BufferProps.kt             |  8 +--
 .../viewmodel/data/BufferState.kt             |  8 +--
 .../viewmodel/data/BufferStatus.kt            |  8 +--
 .../viewmodel/data/FormattedMessage.kt        |  8 +--
 .../viewmodel/data/IrcUserItem.kt             |  8 +--
 .../viewmodel/data/SelectedBufferItem.kt      |  8 +--
 697 files changed, 6392 insertions(+), 5965 deletions(-)
 rename app/src/main/java/de/kuschku/quasseldroid/{QuasselDroid.kt => Quasseldroid.kt} (94%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdd1c128a..54e3d8849 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 b7931eee3..ac716adf6 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 8461fb730..7766e5d8d 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 f11e6a9bd..b2a72e533 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 3a8676dc4..c2534df0b 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 48c72cfed..304bffbcf 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 36a756b03..cefbe7e8a 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 c680e26c3..5cf23d6e7 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 96b3a7d1c..a99e8e2d5 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 8af787c49..d3949bc2c 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 cab9b28b8..04d127972 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 d0fd0d5fc..8a94ddd37 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 44e5bbead..d09b8a6eb 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 9b59628b8..7e13ec17a 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 24db7f326..04b4567f7 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 7b50b8e2e..bcbe594c7 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 b5f184299..aa2f99f3c 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 b3092d1d3..95cee0705 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 f9d0d3192..74caf21aa 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 7d6d6fcb8..8d9f8e774 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 9ec34fd9f..7d6fc189d 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 d577ee1ec..9143fa3bf 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 8b1b81515..ba91d912d 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 627067ba0..fb9042186 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 16c24fa1d..c44556e34 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 eaab294a3..55c23e193 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 5c9dbdb7f..4b0aebce9 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 55db750e2..17963df06 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 6b22cab55..5196c970d 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 7e29ab877..311b3b6ed 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 1a4a89b42..87c996132 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 d56c90246..3276a0438 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 f41fd13c8..782bc3ed1 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 d9819d0a2..fe651c994 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 0bff8c758..f3454def7 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 58f382105..5465abd41 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 ce591728a..706827229 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 6988383a1..3c06f73e1 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 aad01600c..87c088ea7 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 24e507588..2540dde99 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 4de5b6e3a..97dc4f6da 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 fec59b6f6..e1c91fdc4 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 5c43a3e76..027161385 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 876d1c6b6..8c9610ce4 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 078c5a111..e7fe19166 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 f5c0f9906..fff72805b 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 225171f12..6c4d3c802 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 ce80c2ccf..50a9b7b3b 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 2f5a0957c..e30f51a4c 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 d5d1bde5b..b377189de 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 9e2eaae8c..c1c2edd08 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 d86dbfb58..f7c8e3aee 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 d66ae79d7..7ae7df42f 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 32c289609..4f6cb6569 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 d6c5d3255..498227722 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 9077e564b..1ceecb991 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 c4bb9ca98..82ecdbd85 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 f8d545de9..f15655e81 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 f8df83300..a1b33bdb4 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 caf7109c3..d32b5ec04 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 c82c5d0d2..5c04e7070 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 4d0bfe598..6e749e16f 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 2fb73b1ce..00fda74fa 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 1fdbbf454..94e003add 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 dd902839d..9a2fa8cdd 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 152acefcc..2b3b306f7 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 45d32d9eb..01dbcaf16 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 960153345..802d4a768 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 bdfa52c1b..e5e8d6cf8 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 40f529ced..e13ebce0d 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 b635ad2e2..7a8236e6f 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 b686d8ab0..b2ad79911 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 b8e3f2217..9b2a43c6f 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 38ac549b1..86e253179 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 cbf97f50b..e4234670d 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 04c6d77fa..5552b31e2 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 5aff5078c..d21894df9 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 304b22e62..acf2713d0 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 2715ce694..125f0c6c8 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 ca3582ff8..a40724e39 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 655474843..a5668042e 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 3be00ebb5..be04f8334 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 ff4823b46..9b02a6019 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 9994b3839..292ed0a9f 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 14758b222..201b9da11 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 667e615c8..ab4e7d6c5 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 f25f4afc7..b24715a95 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 95f92825d..d5a98c158 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 d30de8543..0fd38fd7a 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 ef07f186f..e8608951f 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 2b8eeb42f..e18bb1ef6 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 bb70dad77..81a246ba3 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 a82961d79..eb16f2ec6 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 09bd1f719..8f241da49 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 cab0589f0..6709b2fbf 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 672e13e60..c35a53eb9 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 7b4cd18e4..88c253930 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 5228c4b09..4292948bb 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 22b6499cd..146b41fde 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 c9c882f04..c8c38b34e 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 f8994adb3..7c7f6f1be 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 9b9f7b509..7f89823cb 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 0dfb46626..c3ee2fa55 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 100e7b342..0f69677fe 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 96382dd89..37215b794 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 b8d7547fa..5c4f71869 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 fa41b8df0..f6c13f48f 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 9030a4ce0..e2d523c52 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 bf66e0b60..eadc3eaf5 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 3c8aa28ac..a221fae19 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 b2bc0d36b..62ff683d2 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 938c3f195..4501ab2fc 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 69b43bccf..7b2e68a59 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 a39395777..a5c4410d3 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 eec7f8deb..38c96759b 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 f9aa80b11..0a3936b7a 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 30a73516b..d41150509 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 7b24e1e84..5c92d82c3 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 685c3b0b4..bf84ec7fe 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 02ac93871..fcbbdac84 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 7a535153f..7132c0f24 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 e409df965..7209604fb 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 1d422b086..1ea9c2b81 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 0e00be20e..1c106a3fc 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 62db0e492..15b8def5b 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 632120fae..2dc65ac2f 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 f2b7eef99..cbac40652 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 09f8cb371..bb47fc47f 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 f42cfdff4..a48e21f2a 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 00695aca8..f7d06ce1d 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 e059f7046..46624356d 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 a116cff27..7f7f542bf 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 23ae48862..b776ce63d 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 2b51e97bd..86d94b266 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 42e38ea89..70269d0d9 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 176c644fc..c097f1cd9 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 642cc5136..55beaead4 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 8c7640fe3..522494642 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 9b76f0859..2b5e20002 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 3dc54c428..075868b35 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 7251eb8c9..16f4b62b1 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 7c33c0522..b4a1258e0 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 4bc793697..dc4f6f726 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 1d3947d29..a83aa7e99 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 81f324ed5..83406cb93 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 8aa267ce0..e9f73ee09 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 31d39c181..ab09e8289 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 676de8beb..0eb9b57d4 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 cd779d7e4..fff414bd7 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 168ad7fdb..24803e0ad 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 d589bb0a7..9ac932fe4 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 ca7e9cf07..ac75bbfd0 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 c07484c31..7985c0fe2 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 5a3299ba4..da93afe7b 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 241762153..3be6af1fd 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 48ab25e66..aa5bf9879 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 c84585854..1cc30b964 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 1c89993b9..1a0e7d0e7 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 502bf218a..606d21feb 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 6f09e8e20..3248b46c3 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 33993d9f5..f6c90cc94 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 6d60d529a..0d2859bb6 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 b249b13fb..0121b1f4b 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 9886571b1..888e0e3e5 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 d1b71bde0..5f129f71c 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 35198f41d..f7ceadc2c 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 df93f88ea..098ac1d77 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 76a397490..36183b6c0 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 1b4717a43..5ecd41b62 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 a607bb5e2..cfa4c68b1 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 5d2e19c9c..7fe416289 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 6567f8e6a..ac33163ec 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 89f014cc2..1fef3a39b 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 ef739d9a3..468a9bdb5 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 901b96c0a..13d1d7411 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 b9f9876e9..a43c51f86 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 7c65ea658..42ceb5cad 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 3584f6b54..b8d8af153 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 1a24f9b90..fc16d15a3 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 543907d57..9433954e0 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 a54a3d03e..736323b0e 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 69c4ab8af..70bb726bb 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 dd3de78ba..7bc4535e9 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 bfcb232e8..42d605ffb 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 b53591dbe..a75a08ecf 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 f2d7cc67e..9bd7902fe 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 52addd433..f9a7f4b58 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 d001fcb1c..1ff241ee8 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 974c1c7bb..36726c8ec 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 7d14e43ed..f6201cb04 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 222e2f08c..d22ca1aad 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 ea5796ddc..93d1fd68a 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 a5531f01c..506e6ea44 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 090267e28..2c040217d 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 db561a64f..89524b6c0 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 4af1056f9..5296c26d2 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 b7f7ace0f..7d70db36c 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 fc768ea1d..c8813d2ca 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 7fe195485..c2131550b 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 f53853548..53fd32f0e 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 8ca9697d2..50e4dd92b 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 378446f2f..2de1af0fe 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 7918e4c22..8935c6925 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 d437c616a..a81aeb81d 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 44501817c..6132cbdd3 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 cf93b3787..05e03ffbe 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 d78045946..c6ea4702f 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 db65d7a88..e7ccd9088 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 931248ebd..ea6720ed6 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 11969d431..92dbb5507 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 598552fe2..885f35acf 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 bea711ffd..2f607f1de 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 08b2b68d7..48e37c1ba 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 facd5d9b2..af888905f 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 3e2f377a6..b82404b6a 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 d3d51a171..d01dd9824 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 4ec078463..e6d33f761 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 ad79f5292..7bc6ecf31 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 8bff0dedc..f5eeaa332 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 10a128e16..78cab0f7b 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 8c35e4167..b869d9703 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 a876712e1..c986c7c9f 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 10a0ae5fd..897b73630 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 8f0290290..41e8a5e44 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 af5be18bb..ffe506b7d 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 0745202c2..227648651 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 ac5014393..6ba1e5bda 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 78f17cb14..97fe17f94 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 4767f4b1a..1075b9f0e 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 9be6ee5c1..123fbdeff 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 2d052f8f9..52e485d4a 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 9e31cd6b8..67cf7e1ff 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 5da403c0a..5b6e04a92 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 ed86c0137..9c1d3d91b 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 2781f986b..788fb0f51 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 4d83ee17e..d3e7b86ee 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 89cde6d0d..90efe499e 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 f8b9a8196..8588ed5b6 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 7e8ecd3e0..99d4a7055 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 82ce2f70f..c93b5ea10 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 6ce2ba376..965472d33 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 f7cb7263a..2d7fe3fd9 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 c2ea8a900..de762f53b 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 751f93a80..aa7a9bea1 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 67bf9d6d1..b2980347a 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 a0eb4b532..f0f8b2c62 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 6c412bee3..440a77623 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 20c37bcdc..1171bef00 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 aafa34797..fa726db13 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 0f824d2f6..3094ac737 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 c1e437c99..f851d71fb 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 8d7decb31..a400b6498 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 b07087090..b80480557 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 a5d6304e3..af9628f2d 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 c6bcd6382..bd213fa08 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 dd5fd2f1e..7e171421f 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 645b26388..61090dff9 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 ef3ba9cdc..ebcfd02b5 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 d2a62f013..184a46623 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 831eaf531..6f406a949 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 e8c7e0209..c2ac3fcdd 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 221c18c35..57f1a20a2 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 c1dd3a435..c85d62986 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 ee5844b21..04f501f70 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 b779cf467..b650f74dc 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 fb47a37a1..5160daae7 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 e60a979b9..505c2220f 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 2e6832210..53bcb4ba5 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 8c3c551f4..b6a34aeac 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 dbab59fbe..d7748cd4b 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 32e1683cb..dffd1aaeb 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 8403c123c..9f31f03c0 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 23b14d6a6..ca73d33a9 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 fce4025a1..1a8132845 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 5d35712b1..71c0e4b73 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 e76f23b31..1306d2a97 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 83b8e151a..ff7c19d7a 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 c7914e954..00663d1c2 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 cf3e29417..a8d3103e7 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 0e3b6789c..9ee280142 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 f014961e7..1f0d82f22 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 6d2f9135c..7c4036f51 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 1f51c2140..2f2a077f9 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 b75334b48..c0f0d5a5c 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 921ed53a3..92c81a264 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 ce37671b0..bc15ffca6 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 9ebfc75e6..a4d3d7bd2 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 b08dcf9dd..e7fadd675 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 482a8ecb6..b924b624d 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 14e1f858d..3d9f58268 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 70a17d2f2..d5a78d39e 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 6910b33be..cc939e2bb 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 436498ab2..7fd23d8ef 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 b4d32bf20..352f73085 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 2d8ccd6fa..3c74245ce 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 dfd500bc3..87b43ac60 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 d441cf9dc..8c41875e9 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 70e610089..c4f785196 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 c679caa08..5bb6803ac 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 c679caa08..5bb6803ac 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 e02c507c9..4e0c0e65e 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 5a881a031..7e6e449f7 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 ef25d44bc..75f40ab59 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 568721dc9..7238a4448 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 e4d0665e8..abc68604f 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 e4d0665e8..abc68604f 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 f532bfd12..ea7be8ae9 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 caef29509..3819d1bef 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 22b1ae5c1..e56f8f482 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 3827634b5..c88c8acf5 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 3c431df0d..bc861c411 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 e3ba8e9bd..b5cb16278 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 c73f379fb..59cde857f 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 ced7fa14f..46249a8a7 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 5eac15254..47240c71d 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 1dc53676b..5972b3105 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 ae18315b1..e1f7b651e 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 5fb65c544..631f1085b 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 61ca92830..d75f1c254 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 dee3141e9..70a67c82c 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 ae0529138..26b0b6f9d 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 9f86c2f28..0cec90e49 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 7dad7edaa..fef8322c3 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 ae0529138..26b0b6f9d 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 1a3ec1d8d..80e05dae7 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 dabc1f962..02314862c 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 48541df3d..e9362ee43 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 eedaf1fd6..ce44b25c0 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 2e8e5e105..2b41b5c31 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 023655440..76a106173 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 fc9b41103..d49843416 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 2861ac2b6..49c091535 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 507b20766..422e90d23 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 d80749050..d2b9e369d 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 b25376f62..8c1b8f62b 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 8798e0eb5..393e4ea18 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 bd3a5a4b4..6e2425fe1 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 883480d29..dbfd332eb 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 d7e44301a..e5fc20fab 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 e3c3a493a..8911cbc18 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 f6037d1bb..b267501cd 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 7737c050a..df8f4902f 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 f1599ed2f..407d2d0ee 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 c194e5e90..540cc207a 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 4fc6d26cb..535f9fb86 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 168e85f9d..5f4dd3412 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 47721fb7f..a4b5e42f6 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 b70905038..238dcc230 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 49be7347a..c84926ce7 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 1587fc1d3..5f549cb96 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 59ed70770..98d1a4537 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 c8669f613..10f1f94d9 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 e2260a312..191b4e34f 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 8dcf3a19c..3ac69e93b 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 2972ea258..d57a1dbda 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 7abe2c286..b00a5a66a 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 58240d822..796d1362a 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 2980d17cc..b1c13b861 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 5df1896b0..cc6d0d6b5 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 f4660fa54..61e536c56 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 21a523947..11fedd7de 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 3333ea9ad..ad7b7708c 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 954406dff..fe97aa605 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 0baf1023a..732689442 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 c5c5c1bab..338115d68 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 fef706556..bda4183bd 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 f552c4517..d5afa2010 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 13ace9794..f46bb7459 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 6d03d5d9b..fd82422c5 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 f9e4eae64..73d335825 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 844323946..1446afa48 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 f5b3785a9..2ef9c2fed 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 ae0cc9110..93fbc1b94 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 1b34e2ec8..267b19712 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 e2f79cba4..ec629faab 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 8263d9d80..f96251c49 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 78761f95a..16fb78bbc 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 248e2714c..1b9510451 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 ca9f082fb..e09238aff 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 4b45beb1f..44961aa11 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 e3aab8e29..d5246682c 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 1a6e99d50..184305f9a 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 8bc59ee9d..2f99697ea 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 fd2e42c2a..40462bc99 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 e65d8425d..10ef7f52e 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 8e042a513..607c77835 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 7fbff600a..806795bf9 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 2f5838f1f..d2c9f6b00 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 e95fd0be1..c4c2768d7 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 6dc0c07e9..128ac85c8 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 0d383461f..39a6c9984 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 35e8ba354..6b28d5c8d 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 eea2e10aa..b93cc4c00 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 207c998c8..189d53d83 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 3e9238208..c226c0fec 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 ac3532daa..7f973b998 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 623d470ad..0a34546b6 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 0506fcf5a..37ed05d23 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 78ff28c6c..f85cfd751 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 7ab2e35a3..100bf3583 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 d2abd8107..9a37bb872 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 2ed292fa4..53ebae5bb 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 a75731b7f..e85ca1134 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 9354ad017..fc02c4eca 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 27e4c251b..e47a14c36 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 27e4c251b..e47a14c36 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 eb3a80d60..1abb190cd 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 185ff7667..a3a2dbcc9 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 759ea07e7..9e235c12e 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 04094426e..d2e3d7bc7 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 c7cf7ca8a..7a79152e5 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 dba394391..eb6eec6d6 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 6a0b8922c..2bb55e253 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 28c5659f3..50da8e4f2 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 2627d303f..51a11cb9e 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 9b89bc0ab..94aa50d9d 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 7f8fb2392..f4835b759 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 1f6893d48..889e89986 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 b95e28840..d27444f69 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 071a8ef3d..8357aaa11 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 76acf8c3f..bff6336b1 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 af065dfd2..9a2bd8fec 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 0daddffad..907b4ed79 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 a8625bb0b..b80896e2b 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 f560c812e..add5b7199 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 a6aa7eb80..1d038d56e 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 1aa30e456..d99781e85 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 8959f4e9a..69aeb9d26 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 05feae896..1bec319b0 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 1e3fc9033..58bf27b77 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 f491bbd9c..6248de263 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 e87f49eca..7bb53ff86 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 7535bcb7c..46d5f6eb0 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 3eb7b6021..107b98d3f 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 2880d8573..cf08194ee 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 8b3291d70..d14ab39eb 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 7ed8ee948..2e04d09b0 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 5269058bb..052f19b83 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 114aa80c5..ecdd36f9a 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 9fd606ae4..6cac8bbaa 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 e3a930b56..b22097270 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 564abf8ce..4d3d68718 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 7f87c721a..b7e485b9d 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 0ca14c330..c018a4455 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 e1d677c6c..9fab6a0ba 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 06d5050a6..6d4600c67 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 f38391cf8..4b7973c1a 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 460b1263f..c3afeb8a7 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 e695eb758..0cb1bbd9b 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 2a4fe3c5f..67250dac4 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 5f30e7ff3..86c5fc22c 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 9c62749f9..33f89fb8e 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 dde517c6c..3cb103d91 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 4941f23ec..92d3b93a6 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 dbc6a01dc..f186fa80f 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 e69de29bb..1be7f65b9 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 e2525c185..b39842835 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 6caf4ebf4..446c27284 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 d9c3d2c83..ec11e5b73 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 fd51f17e9..0defa2db1 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 91309ff2c..6cf7605df 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 93356a399..641d7b81f 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 e95850f9e..48e7ea26b 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 a761d81c1..eb95066e9 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 b4b9fe8b4..71e182159 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 83d8f9429..adcbfa55b 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 136fd1d7b..d2fc55f2c 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 070197ba5..8cff1dfc6 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 b6972cc25..963587651 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 5b2f876a5..787e0c6d2 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 16608dd81..f3ea84686 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 eeadd382e..0f4bf99b2 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 10a527ce1..da91c8058 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 47336ab39..de27e24ba 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 c57025ba3..9e2c1951b 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 110c1c279..952e58263 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 df05b4af7..e6d138e8b 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 899fa0ec4..0329975e0 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 9e5daf154..9a723e20a 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 aea4d73a5..555b18f00 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 6a11a6cae..06f3d2287 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 9764151e2..42a5a73dd 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 905b1849b..edae6f7fa 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 651688e52..b21581543 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 2bf5f98eb..f79ab3bab 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 a4a6acf50..c4d16b72d 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 984cc4ee7..e27c9389b 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 71c8b3ecf..587d80b57 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 c652a6c55..235433ed7 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 271990757..88483f73c 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 707fdba89..39dd5d8a1 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 a66f59c50..a7a7ff366 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 0afafb5b4..732c2b290 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 d79f45e98..4c25e4f4e 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 a6ce84235..6925eab77 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 eaefb3619..207ca9981 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 bd0e391b9..73353ab10 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 c13af05df..b6cfa0d78 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 df0e9c581..5fa314df7 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 7ed0e8e2a..ccf504023 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 6885ed9ea..366ff7ca4 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 fdb261b8f..cfbbd0d46 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 776d10708..252f7d091 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 3d68b0748..93f05628d 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 443b4d4d1..a90fc1c9b 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 a202634b4..31cb3ae79 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 101743baa..9b59c1b3a 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 197d26305..6954dc0ba 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 226c893ed..4dcb5ed33 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 16626ac11..8d493675e 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 d682b6289..ec9bc8c93 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 aae2da998..7c1b50433 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 291ebe2f2..c96888be7 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 e48009484..f1009181a 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 09397572b..36a5c7a30 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 5e7b7a6b0..1d18e14a7 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 6306c3b25..491ff77f1 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 9db9720c0..8bf61a32e 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 93c02899a..40cca0acd 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 637f0c81c..8075ad752 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 dcf4222b0..d31ea6d63 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 c168fd83d..7ae80c642 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 0f507b98f..1f916e909 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 2a5e92490..e28a1ff0d 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 be3f40ce5..39dde056a 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 d3205d17f..61ab9cd0f 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 200baf87f..3cbdf7e10 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 bf5824caf..d2b8663dc 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 d45582ed0..4ef809315 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 32d4a97c9..33334f4db 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 0fb5e49d7..2403886f8 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 c44850553..e9e120e21 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 e748608d6..c4efc1ae3 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 3a3b11e80..74a20d335 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 22edcee5b..76bde7336 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 a8d50f79c..8c18fce36 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 e314f104d..09b05a2c7 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 e62678a4b..39fba3469 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 c01656855..cb222c566 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 c294c9ac8..a0a212528 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 1f67bef74..3e558f47f 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 ddd6b615d..69a9b7719 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 fe877eb10..da634ba3a 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 0b64c3b26..e2e4049b4 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 5cbc1eeb4..e65dbb30b 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 0597543de..971ae1e8f 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 abccf0850..1bc9c4ef6 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 2e003d1bb..5fa7adf6a 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 8660a2a5e..13de745d9 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 4ba2a60b2..4be36c205 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 ffba8e3ec..c8be2b0a8 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 115105212..1938f7e82 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 c54cfc3c9..f9a31b307 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 45c2767aa..e214b9b81 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 a16148702..86b746a4f 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 f7e6ff002..655f90f55 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 3849eef38..60c1bf543 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 1032a2490..068f9daa0 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 744a438cf..b55a0da53 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 e8515c8c8..02fdddc8d 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 930395fc4..aef75b5bf 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 3d377d111..22ade4b10 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 117e0a8b2..651a956cc 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 862d0058a..3332c4b00 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 5b2413caf..e5883cfa9 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 bbdd5c3df..c0cc1df06 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 2f8715990..9407f207a 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 f3c128cbc..e37d16c9e 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 61d37fb69..74e760d48 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 5d7a955d9..66d3de8c8 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 b0ac0444c..948d8491e 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 7174dead5..a726fcfab 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 b04f3d5c4..476ccec11 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 4f67a5830..5653c26a7 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 4eadf9594..22841a375 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 b58310175..41057ed2f 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 71008cfcb..237f2e97c 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 6101a971e..08bbf9c6b 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 1efa912d2..e2a91a005 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 6ccbed7cc..182ff0675 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 7296d6429..f6af0a50d 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 a8fac3091..d9195809d 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 301973b49..6e94e6aeb 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 41e297943..251c6b403 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 4df9414ac..53562b631 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 53eb945a1..98c1f5d09 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 1e4ba6c08..c4e808426 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 dd8ff5674..d433ea455 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 2f08fab99..3be85d0e1 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 dccfd0cdf..5eb3a75be 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 96c4ccd71..cbc90e4ef 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 b8e28de7d..87b67bca1 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 ebc1341d4..15ea5b251 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 5ab2866f3..d68c0fb35 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 298e24194..4098293a2 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 4a7ebcc82..088794fbf 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 5c7f573a8..03db86b19 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 8eddf093f..ebc5ab6fc 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 821ce5878..9357cd96f 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 64ca63b0f..58242aa51 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 d774c361f..c9f0b94b7 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 1cecb76ce..c8ca01ff1 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 e8781855d..a8f9f1b3f 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 a63ac2d3c..d77349248 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 03914b326..fd746998d 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 a27d43bb0..b5b10fc27 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 941ede7f2..cc7b5975f 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 f7a6e439d..ef0f4c05b 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 492918788..03b489189 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 5610cd4c2..9d1809a8e 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 81dd95e83..7f2b0b897 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 49d3b0202..d66d13c9d 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 3c9c312d4..b26a8dc6f 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 f22f3b5ae..d1a457ac0 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 f5c65f3c1..0e8ad9ca1 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 36e1ab392..64c10ecfb 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 e8c36567b..a7a117a64 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 cdfa2371f..6c6a58e09 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 97b50e5fc..1b7fd485e 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 2265521e2..0da1f8ab1 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 d9f7ed3c1..962d0a2af 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 c76e2971e..4d47a57f0 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 ca565e904..189b74173 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 dabda1aea..614c0c971 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 d54d20c8b..fd87e3f3b 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 bc86422b7..be22d5fbf 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 54e41b802..28757f498 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 a2eae497b..55b141ad5 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 7c4ba0538..63e08ea91 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 9612c1439..7ac33e941 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 cc6bddddc..72b830120 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 f0cf913bd..9b1c41e80 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 c827ad2d8..a62877211 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 9e813ae3b..0b279725b 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 1bd79c8f9..8afb5cc04 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 7e73b4c68..e20973476 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 db73d516c..af63f1e39 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 af15b9882..93023e68f 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 a6d93378a..6e923cdcf 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 c5901c9b5..4b5a1d6ab 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 6b58ac2cc..d94abc65e 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 cf7620e69..eac3e97e5 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 08cc994ac..0799fa433 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 076fa53fb..f7374cf52 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 4bfa653e5..2f2ce11b2 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 ae7bcd22e..935477e9a 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 441ee63e6..e6af6e33b 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 eab0082ad..04bf527bf 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 6ea3a583f..94f8c6483 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 1ef2bc143..b459fe1a4 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 e2decb376..47824ed99 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 8895e04e1..4f2eb53bf 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 605f32482..743227859 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 3f2f07b08..3ba71cdc7 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 c779eebbe..77b78b4f1 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 9e474d300..fa83460d6 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 6aaf31074..5a9f5e63f 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 8c741f111..2307a73d3 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 88d249e46..427f54a4f 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 45ad404ef..534696b9b 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 c40b780d7..032c08169 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 154b8ce1f..8050dbc83 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 14c2024a4..2ac338126 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 69fca4168..6b5b914c1 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 9460ad57c..2006b832c 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 ad2dcbb44..9e054c0ba 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 a6750fde7..7c4ce2faf 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 b3ea86af2..a2258af9d 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 0246e01dd..a67823cf5 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 091ab25e1..09d7c058a 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 5dddb8376..64217d929 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 626cc761e..a18c7c522 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 30c6ffe90..f448a8853 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 e07a62402..2a35c3c41 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 91ee4e247..9fcd32ec8 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 30c18586b..f93c5b025 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 d5539a85f..0e77543ad 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 5c20c6e8f..3e542259a 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 7d0cbe926..6f60546a0 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 6af78fe1f..63dd06412 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 89566734e..a5c43df1d 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 55e2f01d6..7bb314e41 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 9f64abd7f..654c811b7 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 ac2023e36..37dbe0b01 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 d3921e858..dc0eab313 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 1861e81ed..cdabb6985 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 31b20d994..4b1e722d5 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 8f14c9e88..ecef9ef83 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 cb01abdf4..5b087b83c 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 e15ad5726..0f72673ed 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 c29e3e5f6..87e1479ae 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 794ea6995..48d75f09d 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 7e8520346..727af2c48 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 13f84a696..cda6cf1f7 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 dac0316c2..0a6d3aae1 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 166ca49f4..7622a3da1 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 c799d029c..50d81611f 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
-- 
GitLab