diff --git a/libresonic-main/src/main/java/org/libresonic/player/Logger.java b/libresonic-main/src/main/java/org/libresonic/player/Logger.java
index ad32335a..36c2f86c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/Logger.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/Logger.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/ChatService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/ChatService.java
index dcef306b..d5c0858e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/ChatService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/ChatService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java
index 4184449e..c6ffeb41 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java
index 5cdaebe0..9464ecdc 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java
index c1335b8c..96e99ccd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java
index 7e376bf1..9ccc46a6 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java
index 308bcb46..4351994d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/NetworkStatus.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/NetworkStatus.java
index d4d9ceea..2e1c3355 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/NetworkStatus.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/NetworkStatus.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java
index 52c654af..e89501f4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java
index 8fd15b9c..dcbe68e4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java
index da92f9fd..8d522cc4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java
index 606124b1..73a91d69 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java
index 3019df7a..1aad3371 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java
index e4952e96..4acea50b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java
index f8b3892c..99afe0f1 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java
index 06565784..56f462a6 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java
index b0720322..a43a0d0f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java
index c6b93b06..171414b4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java b/libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java
index 3279a797..4f1b72fd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ajax;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java b/libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java
index d83f400d..d8606281 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.cache;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
index 035bad3d..bd3d7b08 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java b/libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java
index 97243b7a..7a25abaa 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java
index 47134ff3..52ffbd47 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java
index 69d884b7..1c45816e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
index a9711d51..67fe762b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java
index c0879e88..8f12e554 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java
index f7bb35fa..81f5d3ec 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java
index 745941d1..6ee0a32d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java
index 40687b24..bfe5a136 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PremiumSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/PremiumSettingsCommand.java
index a5195c80..f20014dc 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/PremiumSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/PremiumSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java
index 9b029eea..109dbee8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java
index 604da2bc..e10bbc7c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.command;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java
index 2c5ddbeb..eb5f9eed 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
index 277c15ab..996a35fa 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java
index f6232ec1..ec1d1012 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java
index 37259e01..0992634b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2013 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2013 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
index 3178402a..a8f10951 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java
index cc137647..1c829ba9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
index e66537a3..9e977ea2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java
index 61f5c105..239bc225 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java
index 6c0033d2..594221f8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java
index 850edc3c..86650bfb 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java
index ea9466bf..19f5365d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java
index c58b1eea..a58dbe5d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java
index 670bd5a3..9c1b5ffb 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java
index ebde6b5a..04cf4f52 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java
index 1ec95790..24f0c27a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java
index 5186891f..8f943a54 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java
index eca96a7d..3f44959a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
index c67ad6b4..649605b9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java b/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
index 448e1937..4ddfddee 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java
index addebaf8..c78490b5 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java
index e9b34bf2..838dcae0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java
index 007d3216..d41df2ec 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java
index e02c0db0..68217c85 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java
index 24f7e1fc..5b7a3c99 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
index 7fa20736..ba446ba4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MultiController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java
index b1abbd8c..eaef1b65 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
index 49389e84..08824ccf 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/NetworkSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java
index 60c9d061..1a634bde 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java
index 35957e29..3fb1e1ce 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java
index edc34251..64808a2c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
index b6247a23..069660e4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java
index 2bd0644b..712aa6f0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java
index 27d79357..138ba550 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java
index efb0f60d..929f679e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java
index 61ec7e8b..7c7858c2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java
index e2912e59..3608b2f2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PremiumSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/PremiumSettingsController.java
index 3db0c9fe..39c29a6c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/PremiumSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/PremiumSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java
index cdc678c5..06691f1e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java
index 82f1bc37..6d99031f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
index aa935a5c..6c813199 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java
index 4d084895..1c321fb1 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
index 6cada45b..769765e0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java
index be7276d8..a357b120 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java
index c64f7f08..d7edb47d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java
index 06e36e63..d7962dfc 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java
index ee1f57e1..ce4910bf 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
index 5cdb55b2..f1bab574 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
index 893243f8..19113a73 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java
index 74f52076..20818b97 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java
index 78c55ad5..bd0366dd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java
index 4bc5c924..5cf59354 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
index a775e721..e049e62a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java
index 79447400..3d1a5360 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
index 91fc3d0e..bd28e172 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java
index 7f101082..19dc60bd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java
index 1e8d1e5c..cdb00a7c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
index 38571283..4a913f9f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java
index 98a87f9b..b585d43b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/WapController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/WapController.java
index 54594f42..967808b8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/WapController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/WapController.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java
index f9366fbb..2da6acb7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java
index 522da90f..71515156 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java
index b5465ae6..ea98c9c3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java
index 7247e1b5..b571ffc2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java
index 5d804026..de7a976f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java b/libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java
index a21c5e23..b9c8bd0a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java
index 293dbfb7..b1a1d4d4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
index fe4ff74e..25968340 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
index 1d3a0005..ca997b45 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java
index 495800b7..be855e61 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java
index 02e386ad..996d84eb 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java
index c6f014c8..ca84b044 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java
index fe8ed9a6..6572fac7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java
index cfbbc0e9..15ca4fa3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java
index 760f35ba..bfd43b1f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
index 15dd06b4..8af3216e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/Schema.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/Schema.java
index 2861fcb8..4cf63dca 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/Schema.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/Schema.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema25.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema25.java
index d5fa4e05..14dc996d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema25.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema25.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema26.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema26.java
index 1d99fe7c..8094e7c2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema26.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema26.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema27.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema27.java
index 0c8da3ef..baa4672e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema27.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema27.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema28.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema28.java
index 6166dee3..c1678f67 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema28.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema28.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema29.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema29.java
index dace378e..2495af4b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema29.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema29.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema30.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema30.java
index 033c3fed..4a72499b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema30.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema30.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema31.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema31.java
index 3f55ea50..a8bdc198 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema31.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema31.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema32.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema32.java
index 426a62aa..bc134665 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema32.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema32.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema33.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema33.java
index 460f842f..c76376d1 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema33.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema33.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema34.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema34.java
index c35afb99..9fb38f88 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema34.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema34.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java
index 841342ae..3aad58d7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema35.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema36.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema36.java
index c7c4ea64..2c763a77 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema36.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema36.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema37.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema37.java
index 7429f5f2..25fd2fe4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema37.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema37.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema38.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema38.java
index 9769ad2c..a2b4a389 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema38.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema38.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema40.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema40.java
index 8bc98590..73c65737 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema40.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema40.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema43.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema43.java
index b17fd95b..5af5726d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema43.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema43.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema45.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema45.java
index 3fe3957a..72cdae1f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema45.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema45.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema46.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema46.java
index 90c866a7..cd002ed2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema46.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema46.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema47.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema47.java
index b02eb365..09503566 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema47.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema47.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema49.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema49.java
index 432d5056..8b49511c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema49.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema49.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema50.java b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema50.java
index 64efd54c..8db91f62 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema50.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema50.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao.schema.hsql;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Album.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Album.java
index 0f99aae8..c7cec5cf 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Album.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Album.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java
index 6cf77d52..c2984e40 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java
index d1adafb7..320a9e5c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java b/libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java
index 12049075..a39da8f0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java
index a77e0b0e..28b709e3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java b/libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java
index ab17a9e3..bc5e36e9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java b/libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java
index 8fcdf2cf..9dc97959 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java
index 4dce8f17..b37cd6cb 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java
index 7029ae5c..fcf505e0 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java b/libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java
index 96082c2f..886d94b8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/LicenseInfo.java b/libresonic-main/src/main/java/org/libresonic/player/domain/LicenseInfo.java
index bed8652d..ca56766a 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/LicenseInfo.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/LicenseInfo.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java
index 0d7879e8..98590c20 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java
index 839aedb1..4b5500c8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java
index 285acc24..aeba1b89 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java b/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java
index 6c9bd177..b08e5fb8 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java b/libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java
index 1a8d9de4..4f0c5bf7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
index ccaeb643..16401e34 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Player.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Player.java
index c3079f46..8a14ecdd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Player.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Player.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java
index 726d1a30..8562e4a9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java
index 6ca61ed2..214a1f79 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java
index deaee64b..2b0045be 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java
index ff310034..d0e28040 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java
index e34d3dbd..e8deeec4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java b/libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java
index f4c0c3fd..a192350e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java b/libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java
index 85a47572..dfa300ee 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java b/libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java
index a7bed0f3..a104a291 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Share.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Share.java
index 69a8bc22..161a7862 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Share.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Share.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java
index 3ee5c676..795cfe5e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java b/libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java
index b3f4f96e..1c5b75f1 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java
index e3f366b2..8cd95def 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java b/libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java
index e139097c..d9269e50 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/User.java b/libresonic-main/src/main/java/org/libresonic/player/domain/User.java
index cfc4f2f7..1c4dba82 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/User.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/User.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java b/libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java
index 841feff4..6b587fd1 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Version.java b/libresonic-main/src/main/java/org/libresonic/player/domain/Version.java
index 07b74ad0..8b105e28 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/Version.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/Version.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java b/libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java
index 564ce03b..163d7bfd 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java b/libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java
index 7df53352..a0f1a0d3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.filter;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java b/libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java
index 06688516..019784ba 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.filter;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java b/libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java
index 18637477..2140c217 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.filter;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java b/libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java
index 796db3ef..6deeb3ab 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.filter;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java b/libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java
index 7a6e45a7..48b3959b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.filter;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java b/libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java
index 68a762e6..68bfe5d2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.i18n;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java b/libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java
index 9fad0ee7..9568cbd9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java b/libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java
index 38ec8528..fe57e413 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java b/libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java
index 5efc6ed8..59462a24 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java b/libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java
index 0e739003..b7b4d8f3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java b/libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java
index 2181e414..c474bfd2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ldap/LibresonicLdapBindAuthenticator.java b/libresonic-main/src/main/java/org/libresonic/player/ldap/LibresonicLdapBindAuthenticator.java
index 66604ae6..3591f944 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ldap/LibresonicLdapBindAuthenticator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ldap/LibresonicLdapBindAuthenticator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ldap;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ldap/UserDetailsServiceBasedAuthoritiesPopulator.java b/libresonic-main/src/main/java/org/libresonic/player/ldap/UserDetailsServiceBasedAuthoritiesPopulator.java
index 92ae1cc4..81f4e3ef 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/ldap/UserDetailsServiceBasedAuthoritiesPopulator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/ldap/UserDetailsServiceBasedAuthoritiesPopulator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.ldap;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java b/libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java
index e3fe9fef..9081c372 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.security;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/AdService.java b/libresonic-main/src/main/java/org/libresonic/player/service/AdService.java
index c8267962..6f108fb2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/AdService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/AdService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java b/libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java
index b5b6d5df..fcdc76fc 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java b/libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java
index c7a73610..f0265e19 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java b/libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java
index 5d7f2687..27e755b9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java b/libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java
index c9e0a4a7..9b81e11e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java b/libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java
index 2a6bdf2c..8e4618ec 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
index 02c1d5b3..f4f61f21 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java b/libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java
index 57be4a8f..441186ef 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java b/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java
index c39b3ba7..1f2aab3b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java b/libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java
index 7284b155..8754345c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java b/libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java
index 4544b480..5b8f0e2d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
index c7ea0bbd..a73a964c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java
index b5a9a4a2..773e215e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java b/libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java
index 64f7f247..f5f4a161 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
index 76562a90..f9959b31 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java b/libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java
index d839f7c6..6ca0f66c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java b/libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java
index a9a5dbee..7a9d84d3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java b/libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java
index 7d9cc474..36871490 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java b/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
index 4506ad64..a4d37aee 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java b/libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java
index 9f523552..5ec0ecfa 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java b/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java
index 7ef94afb..bacca409 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.jukebox;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java
index f85fa0ea..7723f31f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java
index c51a2f76..628884ba 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
index d73b2a79..3eb00e81 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java
index 99877014..bb5b3f97 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java
index 2576bb2b..6f724e1f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java
index 582367c1..dcc892f5 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
index b32d95db..464ce2af 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2013 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2013 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ClingRouter.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ClingRouter.java
index ae2f692b..b8c59644 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ClingRouter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ClingRouter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java
index bae788b1..7323039d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java
index 65fec298..61a06245 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java
index 9af07020..e9106714 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java
index db4480f1..631c604e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.upnp;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java b/libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java
index c5bb971b..736e918d 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.taglib;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java b/libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java
index ebaab910..81c53903 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.taglib;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java b/libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java
index 9ec47ca4..42975ce9 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.taglib;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java b/libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java
index 27ff822f..4ef8d9d5 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.taglib;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java b/libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java
index b716693e..3e7a6065 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.taglib;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java b/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java
index 61bffa4f..437948a4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.theme;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java b/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java
index acc672de..2ac4c5e3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.theme;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java
index 575ff713..dbdaee36 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.upload;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java
index 42d3bf43..94404dd3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.upload;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java
index 8592dc90..d7d1b210 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.upload;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java b/libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java
index 17f0a66a..03defff7 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.upload;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java b/libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java
index 137bdedb..68f9f6a2 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java b/libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java
index 10a8840b..43a3a150 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java b/libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java
index 1853f137..ea7f8546 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/Pair.java b/libresonic-main/src/main/java/org/libresonic/player/util/Pair.java
index ca355fe6..b10028fb 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/Pair.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/Pair.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java b/libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java
index f63b91c4..3e3ced4f 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/Util.java b/libresonic-main/src/main/java/org/libresonic/player/util/Util.java
index 7c6364df..b16b17af 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/util/Util.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/util/Util.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java b/libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java
index bade413d..44b5260e 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.validator;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/validator/PremiumSettingsValidator.java b/libresonic-main/src/main/java/org/libresonic/player/validator/PremiumSettingsValidator.java
index 82a15fa7..e4a2438b 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/validator/PremiumSettingsValidator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/validator/PremiumSettingsValidator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.validator;
 
diff --git a/libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java b/libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java
index 0314e2f6..3686e8c6 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.validator;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java
index 04430dad..4090cd64 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java
index 44446f17..6cf91393 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.controller;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java
index 1e428250..173bddea 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.dao;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java
index b87ec34a..5c91f9da 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java
index 6cd5d8a7..5e023e11 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java
index cd282b94..d7592d97 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java
index 53da499c..686cb1ce 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java
index 4e9991d0..ef63a772 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.domain;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java
index 3a6797cc..ae282797 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2014 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2014 (C) Sindre Mehus
  */
 package org.libresonic.player.io;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java
index ed1f362e..69b64949 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java
index 72e0ef0f..2bd4da2b 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java
index 1babc8ee..70db7a89 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java
index dec76924..6dba29d5 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java
index 815f2ca7..fd532429 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java
index e79b9520..9990bfa5 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.service.metadata;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java
index 9c2dd521..d2ba5487 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;
 
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java b/libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java
index 8fb3344b..d8b73d5a 100644
--- a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java
+++ b/libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java
@@ -14,7 +14,8 @@
  You should have received a copy of the GNU General Public License
  along with Libresonic.  If not, see <http://www.gnu.org/licenses/>.
 
- Copyright 2009 (C) Sindre Mehus
+ Copyright 2016 (C) Libresonic Authors
+ Based upon Subsonic, Copyright 2009 (C) Sindre Mehus
  */
 package org.libresonic.player.util;