diff --git a/.mailmap b/.mailmap
index 381e339df406dc26ed8a4a88ececea8673bd8fbb..a6cf996587c06f399f046641be690f06f98fd36b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -140,6 +140,7 @@ Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
 Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
 Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
 Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
+Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
 Golnaz Nilieh <g382nilieh@gmail.com>
 Grundik <grundik@ololo.cc>
 Guillaume AMAT <guillaume.amat@informatique-libre.com>
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index cb9c33cfe582e83ec0a30ae2237891b59da19a44..d4804394c5f13cbb2b80423411369a71ae7ca657 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -2,8 +2,9 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
index 8a9df8ea3ebcd36ada0b85293b450acfe1af7a7a..f727fdf9d70447c8499dd713cc1c006dbe1a1f9f 100644
--- a/apps/encryption/appinfo/register_command.php
+++ b/apps/encryption/appinfo/register_command.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Thomas Müller <deepdiver@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 use OCA\Encryption\Command\MigrateKeys;
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 8fa163d0751b58e3f4f609ece38bf20a402c2620..a73cc578437e7213972b033b43a553fdafcb5c2e 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/command/migratekeys.php b/apps/encryption/command/migratekeys.php
index b814d697a2c05913180340705a71b8b4a9ad2ea0..e6e5e7b70b0646d8e8c1ae454515300e30fae606 100644
--- a/apps/encryption/command/migratekeys.php
+++ b/apps/encryption/command/migratekeys.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Thomas Müller <thomas.mueller@tmit.eu>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Encryption\Command;
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index f1a2651443e0fd8e229cb9c0ecf6bb1cd80c0c7f..a92c49f539f703ae5f7bd7011781c3a8b5d699a6 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 7fa3f469a14441ff0e45e34b744178349006df04..641c97e1d6e37b2808f3d3932bbab550301398a3 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php
index cdc4b2e92e02b926d31b3df8e971436b4f5bb539..f330f726c0b0db759e6419cb93c396cf45ec0c41 100644
--- a/apps/encryption/controller/statuscontroller.php
+++ b/apps/encryption/controller/statuscontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/hooks/contracts/ihook.php b/apps/encryption/hooks/contracts/ihook.php
index d4f20700d781d405a74ccd2505e098eddb636ce8..53217f8ac068de0f7fffe4339e783dadfdbfb6b3 100644
--- a/apps/encryption/hooks/contracts/ihook.php
+++ b/apps/encryption/hooks/contracts/ihook.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index 65af3a93d0a76097a0679eba0b95eab8905e4bc1..f3cf38fb96c8c55ddfbdbc2b783be0843da10519 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index fe1d955524a48f5b2110cc31af4edd8609b1dedb..1fa0581506b4f380b3cf71803cca22ee31be7d2f 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -2,8 +2,11 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/hookmanager.php
index 4b885cd7f644d1809fcd7f08bd85889df4a39f0a..0fea1b0f9f24c85f0dc85a32c44e6f2d6d36e80f 100644
--- a/apps/encryption/lib/hookmanager.php
+++ b/apps/encryption/lib/hookmanager.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index 3acf77e4c44c17e654107dae72f61badc8553593..98fc5be777a9b470abf19c98d471a1f5ad5861e0 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * ownCloud
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
- * @copyright (C) 2015 ownCloud, Inc.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
  *
- * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index 61a659e484e189ad30194908644a048be3c5b5a6..e31a14fba63a8a96b37c425728250df2c545f1e4 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php
index 9709518a27db96a9ce46c257913daa5cbb1032c6..c3759c3fc56c1313f9de8be1b55f7e9cbd0e166c 100644
--- a/apps/encryption/lib/session.php
+++ b/apps/encryption/lib/session.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index fd8261cc637cfdc306b6f4d2acee341d2ab194dd..f224826ed52198b7dd2123451926254d3547eeaf 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php
index afed96aaa38d07a53731820d2252e643025faf76..fbedc5d6077b466055b21fb8c0e1315286fb703e 100644
--- a/apps/encryption/lib/util.php
+++ b/apps/encryption/lib/util.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php
index 89b541e7bd61b2bf7520cfdb48902b9b3573db19..d122b992ef0a4ad8e154434b73dc55f2a1f017f7 100644
--- a/apps/encryption/tests/controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/controller/RecoveryControllerTest.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * @author Clark Tomlinson  <clark@owncloud.com>
+ * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 
diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php
index 478bf8213b5f05d1de44e9c2948a71a98dcdefdd..ed8135b9c4db24044dfc3333cfe2f81bc343535e 100644
--- a/apps/encryption/tests/controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/controller/SettingsControllerTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php
index b0cc9cc924ad83af32b26ec771dcdabf195dbb16..921c924d015b5c2f40c86187dc9c212e07e66fa2 100644
--- a/apps/encryption/tests/hooks/UserHooksTest.php
+++ b/apps/encryption/tests/hooks/UserHooksTest.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * @author Clark Tomlinson  <clark@owncloud.com>
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 
diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/lib/HookManagerTest.php
index fb74c05546bba67d13284ce04d666f911376fe87..b1d511cb89b2393b8b9705ad193c1d9b2d56895e 100644
--- a/apps/encryption/tests/lib/HookManagerTest.php
+++ b/apps/encryption/tests/lib/HookManagerTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index eb43d5a843f1c5d74112cbfee72821ae1f63053e..2561b29462f494c0d1ffde34dd9df61e1ce2fca6 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index c876cea05c96a003e4996dda0df2519379e66f7e..c07a4539e9846c15034d3b240d84593f9dfc3c02 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -1,23 +1,23 @@
 <?php
- /**
- * ownCloud
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
- * @copyright (C) 2015 ownCloud, Inc.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
  *
- * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php
index 0b85192690bf6eb518baed554a00d5ac02371d3a..8d5d31af0b82196c206cf8d465d279c75351bb12 100644
--- a/apps/encryption/tests/lib/RecoveryTest.php
+++ b/apps/encryption/tests/lib/RecoveryTest.php
@@ -1,6 +1,10 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php
index 18cf0386793853c7d2a0d63fb3612945056bbac2..e75e8ea36b4c691e2310c86f25e4005bf655f3a5 100644
--- a/apps/encryption/tests/lib/UtilTest.php
+++ b/apps/encryption/tests/lib/UtilTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php
index f850725108bba70186f1b5f61c300e3907446ffb..14ed1513e1e39d00de0d31d08fb66c78f5657f7b 100644
--- a/apps/encryption/tests/lib/crypto/cryptTest.php
+++ b/apps/encryption/tests/lib/crypto/cryptTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index c6c0d57eff5d3084b7dabca5cadc35f9f4bc467f..7b0b29fe197c54b4e9c7b5ebc0c153b354cd53b5 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php
index 354de26253e339f7a58b6d941bd449d4581a39c7..e6936c5c12e7872b94c280f197c56766b428dd0a 100644
--- a/apps/encryption/tests/lib/users/SetupTest.php
+++ b/apps/encryption/tests/lib/users/SetupTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index dcd05d8da9ea3f082bffd711f1e52b348cd4e881..2d02869df14f135c3d6fdffa0116af638a77dbef 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -1,13 +1,11 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index e56e425c1c643aa1198e7a9f4a7832650f30591c..10f8704dded5623cd488a40670c244bdf8baa783 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -2,7 +2,6 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index ab02f993f82f316ba35c278e4175a722420b0d87..0961636a116bde8096b8e94574c62b210c74bc27 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 6dd3e3e7a8035e9eb9ea708d1c02201bcc01bcd5..be09b288d4b479b71205e8f4e756679ebaf91579 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -4,7 +4,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index b15457e017397cf706dff30e2befda44d48f206b..a2897dd437ac798539937186f210f6d4ea4deabc 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -6,7 +6,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index edb6dd7862de96a92b20b0d91de5940f21a7eed3..a24a57b10464cc47e553ead57a6da09536c6f2ad 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index debdf26ffdf7cab2a536c50204634de79ce2c950..4bc2ce8bdf3f9238b91d406ce045bebc925aab52 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -9,7 +9,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Luke Policinski <lpolicinski@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roman Geber <rgeber@owncloudapps.com>
  * @author TheSFReader <TheSFReader@gmail.com>
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index c483ad31ec53e74f4bab393fc3414bb568540c46..40b194ab88298441a1dbc3cc84e51148aa2b3d9a 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -3,7 +3,6 @@
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index 08c9041062db6b0897facebfbc530bc966638cf7..ceeb3cdcc8a5e66f6c9b21e2c38cea57727ffee0 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tobias Kaminsky <tobias@kaminsky.me>
diff --git a/apps/files/download.php b/apps/files/download.php
index c85051e0f4ec3813c5b837c368cc22fa7e1acbe8..b0628e394be5705f609c80648f5b2b99ead66dcf 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jakob Sack <mail@jakobsack.de>
diff --git a/apps/files/index.php b/apps/files/index.php
index ee12df5f075af59edc39f09c1c8f1e8f048038b4..4f103f975cbc87448266a4f4d1f37fffe9320388 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -8,7 +8,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roman Geber <rgeber@owncloudapps.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php
index 1f8d6330e51e2bbb532b63f36335b488beeb13ff..4ab8ad11eaef20ecef39580e23ed0d0942897e66 100644
--- a/apps/files/tests/activitytest.php
+++ b/apps/files/tests/activitytest.php
@@ -1,11 +1,24 @@
 <?php
 /**
- * Copyright (c) 2015 Joas Schilling <nickvergessen@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
-*/
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 
 namespace OCA\Files\Tests;
 
diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php
index 0ec38e0e2e7331c5bf35469d229281f295cda586..35d00af75ba7c79bba3093dc1e245e95fdf1c27e 100644
--- a/apps/files/tests/controller/apicontrollertest.php
+++ b/apps/files/tests/controller/apicontrollertest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/service/tagservice.php
index 2b5d1e5ec343a0526a7d7c0d5f0498d294bd6ea4..147e698aaaa2d2c9b983e8972fc9c2019a9ef2ae 100644
--- a/apps/files/tests/service/tagservice.php
+++ b/apps/files/tests/service/tagservice.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php
index b41f2e0c0dfa390cee825de6ed11bc290236c9e2..1b93cc3a1aa183207d6ad1a966b9ff6c805af1ec 100644
--- a/apps/files_external/ajax/applicable.php
+++ b/apps/files_external/ajax/applicable.php
@@ -2,7 +2,6 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index 495387b45bb1b5e3001044359373c33446b86be1..55dc417b73a3e906916138a7c06356df2dda30b0 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -3,7 +3,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Volkan Gezer <volkangezer@gmail.com>
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index cc64e298b9606b0a4eba3590a7aea64e3f364fbe..66897eba3d36390e0b682c1b282ba0ced8b561dc 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,7 +6,6 @@
  * @author j-ed <juergen@eisfair.org>
  * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 8c6dff7a9012ead7c6c5ef057a890ea7aa10d315..97eb1353b1e05cd5cbc265cbe9fd978fecba0f83 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Ross Nicoll <jrn@jrn.me.uk>
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 541113fb530ab866ed07a1f8349e2f7672b5b969..8199d97eacb3daa95ede765e420905414b2f2a12 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -5,6 +5,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php
index d9bcadb9eb7c7d56966e4330346f64e2837ca67d..1bcea6bc96d5f46a2ef2deda8890aa24206da500 100644
--- a/apps/files_external/lib/sftp_key.php
+++ b/apps/files_external/lib/sftp_key.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  *
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
index 9fd3aa3721f367155ab5d05e117977dafa3045d9..52b73c46ff9d3b4401e60c3faf649041014b358c 100644
--- a/apps/files_external/lib/smb_oc.php
+++ b/apps/files_external/lib/smb_oc.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/apps/files_external/list.php b/apps/files_external/list.php
index c97c0d8f653f7e41d71ba9f5e79ff2fc3f9a2e3f..b98db79de89879e36cdbcc6206d7d1a1ef144371 100644
--- a/apps/files_external/list.php
+++ b/apps/files_external/list.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index b2ab32411f995da3e92952718e76e630aff1cbc4..1ac0f65a1f051c66d8414a0d3e5a47e411f09b9e 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 7df0f73f6525589d6ba6a0ac4376fb9b994952da..04445127b34e6bd166adec84e9abb8c91210ec6b 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 51eb4abcc00e8c2e637ed035109505b00dd8ffc6..930f994455e2cd4c21c0cb56dcf03e143525ebb8 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index daf205d3d5783d76da653db7d2e838c1778be384..6db68713d9802a5ce6ba16faf200566c4cbc221b 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -6,6 +6,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/backends/sftp.php b/apps/files_external/tests/backends/sftp.php
index 29461c3abcc3d9fe8823289b27355a48e018e388..da2c0ac6ba2f86da23b10e1821855b4fdf94719a 100644
--- a/apps/files_external/tests/backends/sftp.php
+++ b/apps/files_external/tests/backends/sftp.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 9907353588e083f8c210dbfa9f8c71a2bdfe7973..19dad215a364d27aed805bae2fb6c22845b2142d 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -3,7 +3,6 @@
  * @author Christian Berendt <berendt@b1-systems.de>
  * @author hkjolhede <hkjolhede@gmail.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index b2f88265ca10a640af5f26afb7feafc8f42ddfab..3ea0fae8522d46477c9a7d532d2965bf11617d9f 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index 2d848f8b16e7ab04fc5d02e1b716abf24dfe7181..24f74455a75072d3a5a8b0a880cae9a2cc789d2d 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c54038f17e3b91f3326a1b23cc92dc74653d41bd..f72f502462244ed96c9ce38a78033917ef490136 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -2,10 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Gadzy <dev@gadzy.fr>
- * @author j-ed <juergen@eisfair.org>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 0eb209450709d80580ae15e02c620dd53c1a7800..b9c2844d78c819d1cf955000f05a3da4115b73bd 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Appinfo;
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 78fa138f5b5e7f48e454577b0cde237f03c4d3b3..2686abed0ae012a2f63c1313599446fe045016b1 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -2,9 +2,11 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Georg Ehrke <georg@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index f19c9ee1f9b78eb3e72c631a80a62b4ad63cd80e..e98b60ea36db27cd6f55bcc471c92f7311cc6107 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index da0951d8e7c3e5a5c7dac24e174d866511808ea6..494a544b2b84371ee3aa97eb19f640a1b269a76b 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index c3588ecdfe519229d901cc62c98130ea1b535d41..7dd04f2f4a0716ece6b9d0e9216d129e220b78dc 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index c5d3643f28d722a5e68183d339864c3586e479ae..3f59fd131d05024c93fc1e00af8427f01e0da447 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing;
diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php
index 3988eddf6f5af3d0c5e842659f1b61c66fa2aece..9f23c19be883685b2a9689a8f26446aa6b4ca47d 100644
--- a/apps/files_sharing/lib/propagation/changewatcher.php
+++ b/apps/files_sharing/lib/propagation/changewatcher.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php
index 227da7cbcb891b246c1845828928ab9506aced32..7929c2aa5bb456d704e689f2abd83d13c6b8f907 100644
--- a/apps/files_sharing/lib/propagation/propagationmanager.php
+++ b/apps/files_sharing/lib/propagation/propagationmanager.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index c426128782a5e62255f67d9333dc0160e14ba687..97ea452aa6cfb79db2b10118d5adb66def050f3f 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index bf61dda37187e7b613038e772c009e5ff16675ba..50957663b34091bdeadbc7b3a15d801901080666 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -7,6 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author scambra <sergio@entrecables.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index da640fd08d320fe491de28ab6f4ded8cc9a7fe92..2577ed91006196a4be3f53741c9a730caa514d64 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index b70274e6bc09ac973187476ac2dafa5daec3fdec..c75f9d1c7b5cbae4dd24f555018e8afc847683dd 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index fdf641e1d2c877b8b0724dd5837fedf0c9e1e682..9ff94eb16c8fb0baf7a76282a3fb169915203acd 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 8a075eeab9f72abe085def8a1c9f3d7a13706d6e..0b56aafc8a982ba23858655dcce3bcdf6f310bf5 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Cloutier <vincent1cloutier@gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
index 8b5afcb9149356f272460ba056d60626e63f44b2..124cb83e6f06b845beaa4b5295a882d3a69f988f 100644
--- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
+++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 710d7125340172376a3a95183e466bee4325b33f..d978daf200c546955d7d1fe03f1cab528fcf3cd9 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index c52036e6f5b0f19d530b4f9a6757c2c8fce2480c..0db8a1ed5bc13702a56b4a6f4167dede75181454 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 91f0347163a54e70c53d8304bf8c00aab00bf5a6..c10333defaa5491cec8728c5a84d9b0d219ced99 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index ff4cb4c0e497a88aab1824d7d3939ab4230a1614..8c61511468731ac130d5cc828d880d2e60c8919c 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -5,6 +5,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index 4ab3475ccfcdc48983f9b059e49289cc31fe63b5..dbaa316f6035038b7a758e3f2ec315aea4002393 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php
index b49180fdc832a1981c24db065979cdbea10e87cc..0cf551c0500ebf4a5a59223de05e1922dd2e5786 100644
--- a/apps/files_sharing/tests/unsharechildren.php
+++ b/apps/files_sharing/tests/unsharechildren.php
@@ -3,7 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 294388bfe267a47423641c9d852638b445f8d5e3..7b4d7459571aee57eba44ae17fd4fb128556df06 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index 4af5de6aaae787f2c96712de47ebb36533a16fcd..488792db4ef45a3c829eb085f4cd4129e87935af 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 944e353b1ebfd279fa01ed82ab9f23491cd0f00f..abec320b0c2c27248ab59224d197fd6459bbdbc9 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index a777bdcf124788bd6b1bab1f3beff83ec8c264d6..46168f7865e34db6dd69a7614d8348640af614d7 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index af86dafa496f5eef4ddbc71b4d1dd0da89965fae..f17ae48f77919471a59452e496487c8354fc26c5 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index e7d8562f57d272c01867d4e35f0bea9ef108f226..417232f663202686a6f379a9455f01728d7949c2 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
index 526ad1d4e354d12248e2616948eac696a3ae7b2a..99a03d6b969781a94beed6ce0552f625a4ad2c8d 100644
--- a/apps/files_trashbin/appinfo/routes.php
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index 94bd353eccc1b48341d4e6694e150d6936bbb04e..e1a0cf955765eff50173d5d8c26fc687334c0678 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/command/expire.php
index e7dd5c573c23ac63783925abb14e753f32fcd538..89b949bbcdf5401a70735e82d2a41778e235bceb 100644
--- a/apps/files_trashbin/command/expire.php
+++ b/apps/files_trashbin/command/expire.php
@@ -1,7 +1,10 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 320ad2eeb8e125998ee41b10ec2af3682898997a..42412d5d4c931efb5272cc7e752f28a7c8ab47d8 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index b30ea7c69f8b5f678bb692d872e410f477b734ef..668a3c515374fed19e8dad9c63820811a2ed3cc4 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -5,13 +5,13 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Florin Peter <github@florin-peter.de>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Qingping Hou <dave2008713@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Sjors van der Pluijm <sjors@desjors.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
index 68602ef8d8a5433b64beefc3a7ffd888c2c313a4..890f03aa09a068634046980bae3d07b528b90a88 100644
--- a/apps/files_trashbin/list.php
+++ b/apps/files_trashbin/list.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 5535b3315bc3c0a7788cde234b32ebfb3220bd72..299c45b19a769e0d10b64b43cf27f7ed0200777e 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index fab46abdc48e54c390bad47594edcffddf68bc1a..8ad0fe58306f888774609e4d615678190e35d6c8 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 3f4d78af82b84999d86a8f95d2ba2262d7b6f99e..e75df28dbcd2e4c2b2952eed6c33c44e0be515dd 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -4,7 +4,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 0705371b8f4a214bdbcaad62512305237ac86aea..3bad0d8a94de9badbe5b79736059e2f931f86256 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 0ea37d3b1b1403eba6cfd65e2cbe44a38486af4f..5dbed1f93eb00261c3c541b04c4a78dbebc6e878 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 6fa0fd6185f171717ee82e2f08ab6f21ac8b21b3..524f9bd153f1750d2db86d75b1406039b3a91313 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php
index ec9aa3e80d37e7f026f79aacfffabe322817c232..4492497f851f1a86b926e3eb5204a9fb84c761b0 100644
--- a/apps/files_versions/command/expire.php
+++ b/apps/files_versions/command/expire.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Versions\Command;
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 3cc324c2306ac15f92e954c5a2457d933672fd5f..22a218f472aac51dd6d81cd063ab1a3d5ecacece 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 296cebfe0588ca4ca663714c8888a2e534e3e52c..e0034f6165f5aa7d16d9893dc6fa1df627b86c4d 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -5,6 +5,7 @@
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Florin Peter <github@florin-peter.de>
  * @author Georg Ehrke <georg@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 0b6bfc698d790d264eda893d3c4e3393f830d4e1..7cca409ed6c438c865778da555c20ab82b51e2b8 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -4,7 +4,9 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/appinfo/app.php b/apps/provisioning_api/appinfo/app.php
index 33dfda9e6e991f3affcb68c2cbc4493cc74898fe..bb5c541c4fd206aea9d6deabeab608445e5e606b 100644
--- a/apps/provisioning_api/appinfo/app.php
+++ b/apps/provisioning_api/appinfo/app.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 87f073f82b00c36afd000d7ebe15698a2526353a..323c8d609c781149f18504facf626b6947e9e0d0 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index 2bafd06a084eafa5908749a6cce408c89d39154f..22713865c1eecf5ab62201c24f89b6ecbb028cea 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index cd156110635026a07231ce248ddf1fddfc27ac8c..c1e492f53c171c7eb9cdbcd508caa6e6ac79df84 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index b709e09726dffd5a33b80da6092e852dd5e7c84d..27fc5765d22b07bab1b192179ea20db8a40528bb 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php
index 94bff8bbf5ba2f3c4a5d785a5dcf39963f0bb8e3..c4298f017fc0489e98034722eb8fa869683e5da0 100644
--- a/apps/provisioning_api/tests/appstest.php
+++ b/apps/provisioning_api/tests/appstest.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index cb677d9b512749a9313b18b009f67f225836980e..b8b027906984433e129eed1ad28997b5b79c25c8 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php
index 0ba76355d588ff1005e1867304fff29421bc753c..f2862565039ce2e76bd27ab2ae7aa5942e44d531 100644
--- a/apps/provisioning_api/tests/userstest.php
+++ b/apps/provisioning_api/tests/userstest.php
@@ -2,7 +2,10 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
index 897e4a9924fde6dc7ff5ff939eb4b5315540884a..41a061e6c5051e8eb89ea9ddae861cf7a9360cbc 100644
--- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php
+++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index bc43466bc1ac70f8f795b5148a55d0b0f49e751a..0b3f84b8bafc4462a0e26e59a9f62765369601fa 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -2,7 +2,6 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 0328259d78fe47b3ec18fe1f7dd4a97c02fca2c5..2bb2e1f8cb67b05731b1c6e88daa78b5c5760dcd 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -9,7 +9,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index 347ea9ce6a9c9816111de356966d85d1f1aef2b3..ef01213990c0806c8183d757ed73f7fcb32c0a22 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index c8c89374e98d205aa52f5df255f272e61a61d786..2f5ee3adfb743bd779375ca8c6af3d6e8f0ab5cb 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index d17361cdfd5f33f0565b84fdf8494a5cae589638..fb54276b463bfcc13f4440322108c6223edb3926 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author ben-denham <bend@catalyst.net.nz>
  * @author Dominik Schmidt <dev@dominik-schmidt.de>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 2f15a5acc6d7cd6d5544857630d1184655fb4c1d..2b99e1c2dc8ed3985a5512402ea8c8655190d04b 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -2,6 +2,7 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index d27e804d8badab16bacae1b6ae836c067dc64adf..3f76f803efd1ad75239ffd4e34b298cb74a65688 100644
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -4,6 +4,7 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author j-ed <juergen@eisfair.org>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index be61cce5088493da237221e150f3a4d7a00025dc..d670e0f22513f2b5fc0a39cb2bc66f133d72dcf3 100644
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -3,7 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Frank Karlitschek <frank@owncloud.org>
- * @author Georg Ehrke <georg@ownCloud.com>
+ * @author Georg Ehrke <georg@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author opensaucesystems <ashley@opensaucesystems.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/build/license.php b/build/license.php
index 6e3806e146427c8143f277049414081316088f53..214ea3c22696a6794dfca14a9eec50d5bfb95a1f 100644
--- a/build/license.php
+++ b/build/license.php
@@ -144,7 +144,7 @@ EOD;
 	}
 
 	private function getAuthors($file) {
-		$out = shell_exec("git blame --line-porcelain $file | sed -n 's/^author //p;s/^author-mail //p' | sed 'N;s/\\n/ /' | sort | uniq");
+		$out = shell_exec("git blame --line-porcelain $file | sed -n 's/^author //p;s/^author-mail //p' | sed 'N;s/\\n/ /' | sort -f | uniq");
 		$authors = explode(PHP_EOL, $out);
 
 		$authors = array_filter($authors, function($author) {
diff --git a/console.php b/console.php
index 781905b04b5f4a0cfff5345f33f564641130173b..3fee81c70c7965f028bb3e3b1abdc4d0f11bc649 100644
--- a/console.php
+++ b/console.php
@@ -2,9 +2,10 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Christian Kampka <christian@kampka.net>
+ * @author Jost Baron <Jost.Baron@gmx.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 2c25d6f9219980eb81bfdf2abaa23e7e49580687..c57143964092fd794c9447a451548891b9f48c4b 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -3,7 +3,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/core/ajax/share.php b/core/ajax/share.php
index fa75f37587f1c4773b2aef62b828b6fb1e1a856b..6cf5eb00cb6c0c42515f6c280a723dd21ebc5070 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -3,8 +3,8 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Craig Morrissey <craig@owncloud.com>
  * @author dampfklon <me@dampfklon.de>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
@@ -12,6 +12,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Ramiro Aparicio <rapariciog@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6a29b5b1c3333f616c78f216337bf37400b85f2b..2f34708faea5d693599d961c3368b7cbb196cd6d 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/core/application.php b/core/application.php
index cca2c60011826bb403932d1b9ec4452d9445616f..0fbb8dacdb71c9a9b2c194573ae347fd3da34dcc 100644
--- a/core/application.php
+++ b/core/application.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 19ea1f7a4d8ba0e53155a08160b5ebb48e1d445e..95baf23f4fa37864250e097dd1eeece30dbc1d4a 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 9e5514429ff8c8dca2b47b9c537b169e89f85536..ecec51e5768fcd61dea371e06cdc4c69e54d170e 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/core/command/check.php b/core/command/check.php
index ddfe9b73bbaab201892facbce946b15d0b2d8d93..cd7f8ee8e4cf02f133c27fd6ee066fc7ecca520b 100644
--- a/core/command/check.php
+++ b/core/command/check.php
@@ -1,5 +1,25 @@
 <?php
-
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 namespace OC\Core\Command;
 
 use OCP\IConfig;
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index dbc5ed77509a11eb5ba1b24268d5d620d31bb858..2fea5add438ad74fe5d180edc2c73e0caf22d7d1 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Christian Kampka <christian@kampka.net>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/status.php b/core/command/status.php
index 737113d4f8594d110bc14be010c578ca52441b8a..a65e985a9ec7522ea85eaf50849a7de846eef3a9 100644
--- a/core/command/status.php
+++ b/core/command/status.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index cf376148a0026344433d5099bbb6e6102b4609c7..ac0d72a8940550ffcaa9f8883a0f2bf2f4e91cb9 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -3,6 +3,7 @@
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Owen Winkler <a_github@midnightcircus.com>
+ * @author Steffen Lindner <mail@steffen-lindner.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/core/command/user/add.php b/core/command/user/add.php
index c52ec4d00900c310a228eeca5dd7d462c5de4968..07060bb172fe4c874c321c72e719c6ba789fae32 100644
--- a/core/command/user/add.php
+++ b/core/command/user/add.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Laurens Post <lkpost@scept.re>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/user/delete.php b/core/command/user/delete.php
index 63b81134873ab56de15c3c3fd52736f50712e161..e80c63bc7327209300e484409740fef06b50b423 100644
--- a/core/command/user/delete.php
+++ b/core/command/user/delete.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php
index 92fcb1d449bdeb0a893232181c20c1d00d4dfde0..931165ef9f685b0e641c689fe95efc833a122897 100644
--- a/core/command/user/lastseen.php
+++ b/core/command/user/lastseen.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 5d89c0ae549bf6a75092e34ae422d38927743251..7a830f64c070f123777b2ae0fe593eaa9ce2d8e8 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php
index 3e4b41c0a43dcb86407ccbdc75894ad07e95b359..6c5846bcef3ae40d5c3c19e7349c04c76297e7f1 100644
--- a/core/command/user/resetpassword.php
+++ b/core/command/user/resetpassword.php
@@ -2,6 +2,9 @@
 /**
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Laurens Post <lkpost@scept.re>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/register_command.php b/core/register_command.php
index 801148aa55e16502a0d9ca1ae0f996228018cebb..03775fd78702a0543b6ed5f90cdd05700752242f 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -4,6 +4,7 @@
  * @author Christian Kampka <christian@kampka.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/core/routes.php b/core/routes.php
index 15554397cc1a4a858b5663f3787586fbf05ebb9d..57fa606f5fb6a84deb5f243c20533509341c943f 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -4,7 +4,6 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
diff --git a/core/strings.php b/core/strings.php
index fdd3116b12fa6b0e1d7207d7bc726c7b4db72219..e89228844d8bd06d84d54c37d9e0865e65135998 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/base.php b/lib/base.php
index b9f2e4ad661832d3a0037f306d9accb63c1590d4..829c2bcb866e214ec71fcff36c9e4b7ab0b2a704 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -12,7 +12,7 @@
  * @author Florin Peter <github@florin-peter.de>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
+ * @author Hugo Gonzalez Labrador <hglavra@gmail.com>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index 26db0c78df20649b1844a1c6ef0251ef9a5d566d..7b1d5d29f2ea63c8e22997acaf902e63f8114a2c 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/api.php b/lib/private/api.php
index dd50162f03e73a436426d488979ce113beba912b..8e483b7efe9da9cbefd1f5ec06806b49feac88bc 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index c9d4a777c4aaf72b56dcb4b15496fa696cd718d2..7a61cd53c59f48f68a28e0d7024fbbb7cda8f8e5 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/lib/private/app/codechecker.php b/lib/private/app/codechecker.php
index 8c2f3405fb9ca94b3f9a331fe0c864d385c75ec0..326bf8cd888b96959a02c75cc59632a743173a43 100644
--- a/lib/private/app/codechecker.php
+++ b/lib/private/app/codechecker.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index bebd93006c953e1cfaf75f9c236032489237730b..fa71bd7d91a394d9b949723b3ba64d10bc615df0 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 37532616e1ece133ccf824e9cfcc007b4b302ecd..b88df10dddd88af237980f9d15e7e08f1e971cc5 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -3,6 +3,7 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index f6c1e31cddd0bfdc58f288a190ddba748da08507..0188d221be15df42e8cb5cac69d58b698143708b 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 2455209cdf3aa13fde2de77a2d13ed46301da31b..7d6a49202c69a22232773e1d999c04a97ffe0511 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php
index e013a74253a7cbf3e56b3170e3876cd998643fb1..63cf5ac24f06e7335d0bf98690731cff306826c7 100644
--- a/lib/private/appframework/utility/controllermethodreflector.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -3,7 +3,7 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
- * @author Philipp Knechtges <philipp-dev@knechtges.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index c7dff6f45719421e1b72ef13767ef6465d68de1e..5a69d3dbbd2ab2659317f734f801be19f882c717 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/apphelper.php b/lib/private/apphelper.php
index c4ddc1b077e3e31eac913d9b536cbd24b5ee3576..9084d2b8ab4faf58d21def98eeca8ba77dbb7c6f 100644
--- a/lib/private/apphelper.php
+++ b/lib/private/apphelper.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 133ab4bcd619ca0e0f53f7fd0440c034e7ab06af..55c328b67788d90cb0bcfc78cd9eaf5e496b6a1a 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -3,12 +3,12 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php
index 42f711ee249cb0f01dec5773741f0ad56506ff41..6b33e8d8e8b18060f97559a485f110d1c94c25be 100644
--- a/lib/private/avatarmanager.php
+++ b/lib/private/avatarmanager.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index 4742128ecbeec3c858722e4986e86b93a0846d32..c033e53e6f7f1d89b1f3c17794c19ec3b56f848f 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -1,16 +1,8 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Michael Gapczynski <GapczynskiM@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Thomas Tanghus <thomas@tanghus.net>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/connector/sabre/copyetagheaderplugin.php b/lib/private/connector/sabre/copyetagheaderplugin.php
index 9f5d74654ccdbef0eda5d094e5feddd67d03551e..863d4cf3e102501a923c0fbf4f2b7d6be9260a91 100644
--- a/lib/private/connector/sabre/copyetagheaderplugin.php
+++ b/lib/private/connector/sabre/copyetagheaderplugin.php
@@ -1,12 +1,23 @@
 <?php
-
 /**
- * ownCloud
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * @author Vincent Petry
- * @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
- * @license AGPL3
  */
 
 namespace OC\Connector\Sabre;
diff --git a/lib/private/connector/sabre/custompropertiesbackend.php b/lib/private/connector/sabre/custompropertiesbackend.php
index 14989a5bac330735ec77a8b1073c06e53f9faaf0..47f34909a082cb7343913573a431b5707f066d37 100644
--- a/lib/private/connector/sabre/custompropertiesbackend.php
+++ b/lib/private/connector/sabre/custompropertiesbackend.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index e99411068f18c160f302d12bda9dd43a587a55d5..551176e4bd21faaced267552f79f6ac80d801d01 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -4,6 +4,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 740660f466bd7594f08821112eb46ab424d502ca..74f96e6e1de20b2d1fd4ccdc4cebfd10feacd71b 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -2,10 +2,7 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author chli1 <chli1@users.noreply.github.com>
- * @author Chris Wilson <chris+github@qwirx.com>
  * @author Jakob Sack <mail@jakobsack.de>
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 09d931be606092d5f293cb0ca5f7f3776c6db256..608e8cd9017ea6becc9990f6ae41b661ffe279b4 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index c4c9a5340bc871fb4a3caf966c6da7e7871eb4c5..9a596938097df2285fca2cd2b1457dbc64e0cadb 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/connector/sabre/tagsplugin.php b/lib/private/connector/sabre/tagsplugin.php
index 6a788b9f3aa321f921f915e863f8d9872a4c9257..7756eb45bdaa910f510c7c498acb9b725461cd87 100644
--- a/lib/private/connector/sabre/tagsplugin.php
+++ b/lib/private/connector/sabre/tagsplugin.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index f2aacbfc0e6414722011094609beccba7d62efb4..7c70992721954fcb5860a68db0c84ed78663d4ba 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 namespace OC\Console;
 
 use OC_App;
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index fcfe5d962799dd01f8f3b8433ebd4c4e38a60182..6a587ede631ccfa0d1eb6124bef368d18b93dfb6 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -5,6 +5,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author tbelau666 <thomas.belau@gmx.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/db/ocsqliteplatform.php b/lib/private/db/ocsqliteplatform.php
index fe39e20c864ba6541de57e2cc39ac1a6f2b08cee..543f58b90ec6256afbcbeec62734e4124fa9da30 100644
--- a/lib/private/db/ocsqliteplatform.php
+++ b/lib/private/db/ocsqliteplatform.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\DB;
diff --git a/lib/private/encryption/hookmanager.php b/lib/private/encryption/hookmanager.php
index 31ecb2fbcf68e364147d156b39ac4c76b9a55d34..d096b7ff3ad74bdf022e6b78af9a81e6166b34fc 100644
--- a/lib/private/encryption/hookmanager.php
+++ b/lib/private/encryption/hookmanager.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index 848d5c0134a6b528df9c1e269be127e1ec19ce73..b754462d9b0a4a482794c44599df049e86f63744 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 4841533cac130936ebd8ff0285b9faec05d81dcb..1e0a065e25a5b5c05ecbaf2841000963f7a86be8 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php
index 02579fd9136897fd1f32dd28082a1759269612b3..125946ab26623b93b7c7e37b513cd945b2e03977 100644
--- a/lib/private/encryption/update.php
+++ b/lib/private/encryption/update.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 8049924956181c5ca126d873e8ca8eb6f056760a..8bff65428d36b74c795fe7bcaef58f2a0e18bc34 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files.php b/lib/private/files.php
index d08cb3f9de0cd5e73d6d89545e3e3992c6e220b6..17e2e5a398f1dd8339f56f95dc906232f00af5d5 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -1,22 +1,21 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Brice Maron <brice@bmaron.net>
  * @author dratini0 <dratini0@gmail.com>
- * @author Fabian Henze <flyser42@gmx.de>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author josh4trunks <joshruehlig@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author mvn23 <schopdiedwaas@gmail.com>
  * @author Nicolai Ehemann <en@enlightened.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thibaut GRIDEL <tgridel@free.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index a82ccec28135442734aea2f9f9740f5a2d7026e3..680398e383f0442d53bb0f4ca6b7e621949ff66f 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -4,6 +4,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Florin Peter <github@florin-peter.de>
+ * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 4d991e5d11d5c4e4931656e9b4aded024b61f85c..90019b649c453cc82a022cbcc990c2c367bf3560 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -2,10 +2,9 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Florin Peter <github@florin-peter.de>
- * @author Georg Ehrke <georg@ownCloud.com>
+ * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php
index 17831d69abbb60577cdf72db59f04982d606cbeb..2c8760ba40ea7419531b18db735cdfdd820deefa 100644
--- a/lib/private/files/mapper.php
+++ b/lib/private/files/mapper.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/files/objectstore/noopscanner.php
index 3a0df13a29073cfef5d16b819d0fe43078e8504a..cdcc0149ab3dc52a5cb1f83f7f6e19071655ddf8 100644
--- a/lib/private/files/objectstore/noopscanner.php
+++ b/lib/private/files/objectstore/noopscanner.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 15f513585fe16c0b3a386c90cbb177dd2305b769..d67e6b9f97e841efaa0c75937bb0c8dcd0a95d88 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -5,7 +5,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Carlos Cerrillo <ccerrillo@gmail.com>
  * @author Felix Moeller <mail@felixmoeller.de>
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 315a8e7e25da1ec77ed504831f6c7052d8939566..53465f8585eeaa9078a1fec583e04c5cbf536d5b 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -7,6 +7,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Klaas Freitag <freitag@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/files/storage/localtempfiletrait.php
index e7f51a1807fdf99d74eca4c9ae8efe2de2f587c9..86c8b5c8377a6b2f8c0b92715fbb14429760039f 100644
--- a/lib/private/files/storage/localtempfiletrait.php
+++ b/lib/private/files/storage/localtempfiletrait.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 4b52735725428ef896fb054f51cf50037af567c9..932320267e4dc8d79e94e7addc4a1979d3b7558b 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -6,6 +6,7 @@
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
diff --git a/lib/private/files/storage/storage.php b/lib/private/files/storage/storage.php
index bd809099e1f90c3059b4e2c012bc02d41d3596f4..f46ac544b56566437f69bd69f0fdc770233a8932 100644
--- a/lib/private/files/storage/storage.php
+++ b/lib/private/files/storage/storage.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 31b4090eda2812465b18f60735174663eadde191..62b393c845c61c3a45bb93de9330b61b782a468f 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Björn Schießle <schiessle@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 675978da2a9e1d402a4a4adb72b01fab911cf75f..ae04e3bec4dd2d118e985ccff76f71f4096fc86a 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 22d230e7c8608871391238bee798d89d22649a36..bfa4d76835812719fb3722723691a2101608c586 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -1,8 +1,10 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Jasper Knockaert <jasper@knockaert.nl>
+ * @author jknockaert <jasper@knockaert.nl>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index f8defe476c41317514c187584fce7d4e109a4280..65ae49dfcd286ff50e2a9a05802e29ba5aabe349 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -4,10 +4,13 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author macjohnny <estebanmarin@gmx.ch>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author voxsim <Simon Vocella>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/group/metadata.php b/lib/private/group/metadata.php
index 66eb032d4bf938c4f5c85bf5cad210addb801156..63447012b0c0d0e62bdd0056b8bcdbc6c8142654 100644
--- a/lib/private/group/metadata.php
+++ b/lib/private/group/metadata.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Stephan Peijnik <speijnik@anexia-it.com>
diff --git a/lib/private/helper.php b/lib/private/helper.php
index f4de5b0d9f853e16ea8a914ca76d7f88ce0b46f0..4c2f1f509c8ee91f7b9447a8636fa6bcae57ac28 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -16,7 +16,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Pellaeon Lin <nfsmwlin@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/hooks/emittertrait.php b/lib/private/hooks/emittertrait.php
index 5d471a3f553d3f140c72de5fcd39fc1653f23d06..256bf468c4fde5d1f6933fb72a94c5c620b0ed8a 100644
--- a/lib/private/hooks/emittertrait.php
+++ b/lib/private/hooks/emittertrait.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php
index f5d80e695ca531b26c988fef5ec860e30ea630b9..77469f88d196d420e0b63541ef00e5aa7d3fb05c 100644
--- a/lib/private/l10n/string.php
+++ b/lib/private/l10n/string.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php
index 3bf1fbd739eacf0a884e44805785742d7be3392d..54e568d9ff6d2403fe40a1894b758bd372efae05 100644
--- a/lib/private/legacy/appconfig.php
+++ b/lib/private/legacy/appconfig.php
@@ -5,6 +5,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index 85b62c8340fb220dd2518ae7eea252cc457ca343..5f2b5e5a4b832006eb0574c832660f3726ef53b5 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/nooplockingprovider.php b/lib/private/lock/nooplockingprovider.php
index 4f33b881555c98fe20e76f463ca039f2e8fea504..a8571f2aec48e8e02db278926192d01a841aef42 100644
--- a/lib/private/lock/nooplockingprovider.php
+++ b/lib/private/lock/nooplockingprovider.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/log.php b/lib/private/log.php
index 840713b2eda82334ca942686dbd30d229f2f4d26..dd5cb6efbb9d6b125457042b381b351f4e59e8d8 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 5e92db398f9c31e4eade853c838fbaae13da3f99..d10c44cc0cddd7456301e8bdd5ecf8c56a47bde8 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 0125164394d9e74ac30a5624d6000247a1ab7eaa..01112ef7f9dece473e56797d1df7c21058fda7a0 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -2,18 +2,11 @@
 /**
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/log/syslog.php b/lib/private/log/syslog.php
index 8595b707d59262c98ba7768909524a96c53bb73c..863d1d6c201ee383ee4e81fea73aa3cf0d91849e 100644
--- a/lib/private/log/syslog.php
+++ b/lib/private/log/syslog.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php
index 8a3fdd2f7c59c53b4dbc644f77e611facbd0b25e..33c8bea87463c785d9ed66b9fdf138be7ba7df80 100644
--- a/lib/private/memcache/arraycache.php
+++ b/lib/private/memcache/arraycache.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 320657a71ad222414d3697c1d97d848d49f5e87d..5bb7e42c80846710acb6c2111cabbe131fc262a1 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -6,6 +6,8 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/nullcache.php
index f971ffc9b2dac5eb8814a95a80eb27401353bfba..de27b03e71d7817d58bfea3021b3839ce77e95b5 100644
--- a/lib/private/memcache/nullcache.php
+++ b/lib/private/memcache/nullcache.php
@@ -1,7 +1,10 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php
index 30619c356bc7d89fe56db4d6129aa654f8e55318..21477798059828e3011af36646c40932e7fc9137 100644
--- a/lib/private/memcache/redis.php
+++ b/lib/private/memcache/redis.php
@@ -2,7 +2,9 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Michael Telatynski <7t3chguy@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 2ed88ef842d34da89b5fb3f49b472c099651f495..efb8089420ef4587d895bedb0f04ef668af489ee 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -1,10 +1,12 @@
 <?php
 /**
+ * @author Aidan Amavi <github@aidanamavi.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Normal Ra <normalraw@gmail.com>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author tiezdne <oswald.84@t-online.de>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index f10a97428e28ef0c4e57a0ac062824d04a9fc86a..2868b407000a5f9726df2bd7f7082e01db47af07 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -7,11 +7,11 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Kamil Domanski <kdomanski@kdemail.net>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview.php b/lib/private/preview.php
index f35998528389df852d4b3ea8919d173ad35b6054..cc954bc36537fbb0bbbc4eb86b9230fb576eeff9 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -7,9 +7,8 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tobias Kaminsky <tobias@kaminsky.me>
  *
diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 3071c7887241db5635c3835eb91b9d544fa09b1c..12ad4f020eb64c7edcc5082ea217cdb9697fe3d3 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -2,7 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/bmp.php b/lib/private/preview/bmp.php
index 0547f053cc10c0484e91a2ea9e5db028cfa7dc7a..2a24a783d5295b048d826b8687448f6d59ea4c39 100644
--- a/lib/private/preview/bmp.php
+++ b/lib/private/preview/bmp.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/gif.php b/lib/private/preview/gif.php
index e2b7c7e2ea23632707bcf5c7594b16648a949052..08f6c41d98ccfcc5cfbe50b5d02832b0d84b5425 100644
--- a/lib/private/preview/gif.php
+++ b/lib/private/preview/gif.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index dbaf5deb08dfd4815a627e911ecd12dbc4f5f319..f9c27e690f61eb2641a9d984554fb53be900b017 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Olivier Paroz <owncloud@interfasys.ch>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/preview/jpeg.php b/lib/private/preview/jpeg.php
index 69edd95835c83fe5c3febc729cfc5e2e1f9b30ef..86e447d34061a12d41d3e2d3f3695a858494c906 100644
--- a/lib/private/preview/jpeg.php
+++ b/lib/private/preview/jpeg.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/markdown.php b/lib/private/preview/markdown.php
index f73351125ed3ebb0f19755b839b6312f366013e9..f5e7469762188a535e74c5da00175f98beb3f65e 100644
--- a/lib/private/preview/markdown.php
+++ b/lib/private/preview/markdown.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php
index 43e49bfb747773bdc122ca6ae5c1671464a9915f..a687fefff65a27948b6e06f395f5dfae953f5286 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/preview/movie.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index 49667d0dd05b8d1096e107f89e60b277deea4a33..25fe6566e447f3f903ed30ffade2bf71b6e2dd5d 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/msoffice2003.php b/lib/private/preview/msoffice2003.php
index 1403000f6198a6132c288c3a615c12fbffb72d0b..dd00cacedf3c3990da2a59a8b8b7de47485a45c2 100644
--- a/lib/private/preview/msoffice2003.php
+++ b/lib/private/preview/msoffice2003.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/msoffice2007.php b/lib/private/preview/msoffice2007.php
index bd53b59fe62a7de2461b5485665d7a02979edc6b..8fcdabc048433cb05dfd96b24d2c33b9c5bbeeb4 100644
--- a/lib/private/preview/msoffice2007.php
+++ b/lib/private/preview/msoffice2007.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/msofficedoc.php b/lib/private/preview/msofficedoc.php
index bae41017616d0d670932788eb734347bbdba8d16..6ce003387fb3c8091287c05a3ad0a997be9ac5f3 100644
--- a/lib/private/preview/msofficedoc.php
+++ b/lib/private/preview/msofficedoc.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 0a61a32df40b67c780dd367b6edd1fdbb5ead18e..f72c5def35f1824b6a58baf755c3e2921ab12786 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/opendocument.php b/lib/private/preview/opendocument.php
index ce24bb22d8b6fa88bc327d8994c442205b1c0e11..21df2b5909a345c24d9c259664cc1df4960b8e7c 100644
--- a/lib/private/preview/opendocument.php
+++ b/lib/private/preview/opendocument.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/png.php b/lib/private/preview/png.php
index f40c1dbcc88fb4f81627954e9593ebb4a7d6d7b1..a6755671326f100891e3756f2cf246da36e24578 100644
--- a/lib/private/preview/png.php
+++ b/lib/private/preview/png.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index ed1f3a1c5c9315301270bc7c03a474178b777bb4..d9b80939246a28926d782ca47d40e55545d82be5 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -3,6 +3,8 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/staroffice.php b/lib/private/preview/staroffice.php
index 43e2e8e7f3c3a2f22dd7e67e031483d392caec1d..b06de79f707a94efb0bcc5b1cc167d482c74e6c3 100644
--- a/lib/private/preview/staroffice.php
+++ b/lib/private/preview/staroffice.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 92d21c07385ee1005c76506a7e1cdcddfda540fb..4e3cba576fb905589110cd75e4a4098a8f6a7c64 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 684438684fbac1d4814e1a760438b9133645da3e..0bba570a8c9387aa7c37892fd608da54cbe2449d 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -1,9 +1,7 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Nmz <nemesiz@nmz.lt>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/preview/xbitmap.php b/lib/private/preview/xbitmap.php
index db7b85ff01295d68ef711145290a5c2d7a581679..8001f21684a91a9255a26b5d7de3789242981b35 100644
--- a/lib/private/preview/xbitmap.php
+++ b/lib/private/preview/xbitmap.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud@interfasys.ch>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php
index 78ae12cd2e5eaf2faa2b40d94e90384a595d2ed4..e351c010c85ad130e6cfb9f383999adb50f803c0 100644
--- a/lib/private/previewmanager.php
+++ b/lib/private/previewmanager.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/repair.php b/lib/private/repair.php
index 43350995beb65a500df54a911404bd07e03f591a..75c004e3430c0fc7798a28b7e19c70921c1de9be 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/lib/private/repairstep.php b/lib/private/repairstep.php
index ef0dfa9ed5f06a09b4ebf2bf1602bb14c92954ea..25cb91da68eef05b91a56188732861a9abd25d75 100644
--- a/lib/private/repairstep.php
+++ b/lib/private/repairstep.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/response.php b/lib/private/response.php
index 5725af2b8939f776640690a202103d84020a3c03..f1a429463f28ff370e9396105c0e3681f17949a0 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/lib/private/route/route.php b/lib/private/route/route.php
index b33360f11ec872747a787e5c2fc2e4bdf93125a9..86f05b85e5bc41d6a43e1f58fd0db7e3dbf9acda 100644
--- a/lib/private/route/route.php
+++ b/lib/private/route/route.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author David Prévot <taffit@debian.org>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/server.php b/lib/private/server.php
index 7e233e645753c0b44d4e42bc0ac82ed7818b605d..6a65895cd6921753d491f0aa55aae56a45639007 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Bernhard Reiter <ockham@raz.or.at>
diff --git a/lib/private/servernotavailableexception.php b/lib/private/servernotavailableexception.php
index 5a57917d23a8e1ff6ad3fef90ac30c1d327807d8..b273f50be9850891e838fc28845142a43f87e2b6 100644
--- a/lib/private/servernotavailableexception.php
+++ b/lib/private/servernotavailableexception.php
@@ -15,7 +15,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 1ffe074dc346d1aff63644a1e944e6dcd95233d7..50bf0dceafcb646b284013775363d9466ee6e0ce 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -10,7 +10,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Martin Mattel <martin.mattel@diemattels.at>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Sean Comeau <sean@ftlnetworks.ca>
  * @author Serge Martin <edb@sigluy.net>
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index cc361a62caf0dc1715ba3a2c6acc313a1e7b9196..13daf1782fc4266558ff6cbfb63563a28c911056 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 713c779e2cc98a571493810344781d830c00d702..b9246a915a69e8962acc4176ccae1f22bf164993 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Michael Göhler <somebody.here@gmx.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index 4e1cb7de610d5d72af1f3402acb3792495782523..791dc7232f5d283f671de446631d6cbdfd76f671 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -4,7 +4,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 082cb6073ffbef63b2722a1de499e954ccfcc26e..597e38f43a6732fed120f99217cc588c4906415d 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -4,7 +4,6 @@
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author eduardo <eduardo@vnexu.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/setup/sqlite.php b/lib/private/setup/sqlite.php
index 4a9ead3d5103d4bebf95bec39b116ec79888f0f3..820a89d4cff6f6a7157fbcfbf216135e95450fe9 100644
--- a/lib/private/setup/sqlite.php
+++ b/lib/private/setup/sqlite.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 1988324a996f735227b70058109961137d127b5a..26bbca813171b0928abd50c963c4145b5d3a641e 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Miguel Prokop <miguel.prokop@vtu.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 7120d8493b0ee556eed4bf97f5cb592670f299ee..8056260bf17b8438fbba421b2b9bff35da0ab5b6 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -2,11 +2,11 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/template/resourcenotfoundexception.php
index 26655b78eeef408ee72a668df4a420a7a5a860b4..22f8bcea0596d9dbb8932f0162b1a9fc9f718884 100644
--- a/lib/private/template/resourcenotfoundexception.php
+++ b/lib/private/template/resourcenotfoundexception.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 998a683d8412886a5e794125a44959b1465e30f7..93bf6cbd307c767cf34de3f7187f1e4119ad0321 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -9,6 +9,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Remco Brenninkmeijer <requist1@starmail.nl>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index eeffc6b339ddbabc220da781b0d997d81e14a1f4..b8cef8e036ec33fa10f04f7637e0cacf435d83c7 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -1,8 +1,9 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 00c6569a52f53690b7f2c1a25eb84cf4eced44af..2894a82338fe338fa3ad6f1bb06ec96adfed9a3c 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -8,6 +8,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Steffen Lindner <mail@steffen-lindner.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/user.php b/lib/private/user.php
index 8083b4e40be5491940c7f93b1250259d8ce77f21..7c3cb528a9a77686d6af2d0963d751ea968dffbb 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -10,6 +10,7 @@
  * @author Florian Preinstorfer <nblock@archlinux.us>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index d080bff04b5ba1c2e2855fc0c27c0eada00bc0d7..0de062ba2ce9fecd22c07a84dada0229b5d20be4 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -8,6 +8,7 @@
  * @author fabian <fabian@web2.0-apps.de>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
diff --git a/lib/private/user/nouserexception.php b/lib/private/user/nouserexception.php
index 9452362b4e6d33a3b1fe667bd9e50b39044086aa..0a077d960bdbf31a61a6facdbf6adc6592502e00 100644
--- a/lib/private/user/nouserexception.php
+++ b/lib/private/user/nouserexception.php
@@ -1,12 +1,23 @@
 <?php
 /**
- * ownCloud
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING-AGPL file.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
- * @author Jörn Friedrich Dreyer <jfd@owncloud.com>
- * @copyright Jörn Friedrich Dreyer 2015
  */
 
 namespace OC\User;
diff --git a/lib/private/util.php b/lib/private/util.php
index 59408c0fc03f017ae70b4b810bfa6aae28ce38e0..9c78ad3ad1c1cfe88b1d9551cfa0d31a713040f9 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -11,10 +11,10 @@
  * @author Christian Reiner <github@christian-reiner.info>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author cmeh <cmeh@users.noreply.github.com>
  * @author Florin Peter <github@florin-peter.de>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author helix84 <helix84@centrum.sk>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
diff --git a/lib/public/api.php b/lib/public/api.php
index 6b920b6cf52fc535d4edd739024221fafd355c7b..a99a3af1c1d467cf25058274e0449dd1d9e1c064 100644
--- a/lib/public/api.php
+++ b/lib/public/api.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php
index 208cd70f4222c9c6d746510a72171b10ca33c67e..d8f261660c11b4d4243bdb391f554bd05bed855e 100644
--- a/lib/public/app/iappmanager.php
+++ b/lib/public/app/iappmanager.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/lib/public/appframework/http/datadisplayresponse.php b/lib/public/appframework/http/datadisplayresponse.php
index 35272d0f82368fd9dc714f409fd569ec4c0eebda..31b4c83ff3c6f05de3d07195997c92315410b3e4 100644
--- a/lib/public/appframework/http/datadisplayresponse.php
+++ b/lib/public/appframework/http/datadisplayresponse.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/appframework/http/icallbackresponse.php b/lib/public/appframework/http/icallbackresponse.php
index 87da73a5ad57aa4840a7c710d05a0e0540849d1c..aa238cbcac959b0d74e25b5c2a3d9291f69a3ca2 100644
--- a/lib/public/appframework/http/icallbackresponse.php
+++ b/lib/public/appframework/http/icallbackresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/ioutput.php b/lib/public/appframework/http/ioutput.php
index ad90dc1e4cb68758772fc207c1127f5f05bdef19..ba4c031001b0ded118e6134f9458db3c1d3bd0c5 100644
--- a/lib/public/appframework/http/ioutput.php
+++ b/lib/public/appframework/http/ioutput.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/notfoundresponse.php b/lib/public/appframework/http/notfoundresponse.php
index 8f59384faf18a3ad72c51f74b958561423c01561..968df6c310c5ba2a5ae6c244ee285e2d7dbdb9e7 100644
--- a/lib/public/appframework/http/notfoundresponse.php
+++ b/lib/public/appframework/http/notfoundresponse.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/streamresponse.php b/lib/public/appframework/http/streamresponse.php
index 625b3d6227817d0f91302b6648e08cc523c9ae4c..b2e0df3a75f1d4cf416e739d12c8c99e56c0f2b9 100644
--- a/lib/public/appframework/http/streamresponse.php
+++ b/lib/public/appframework/http/streamresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index 2de2a360453f29dd9a914fa72e090bc37d319210..7d1d230a77f58d9b0d9d36cc3e204f1690474259 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -2,7 +2,6 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/public/command/ibus.php b/lib/public/command/ibus.php
index b27edc0474262cd4b814fb8595ed5158f349b7d0..796862fbcace676832c15be45ad9e1e8e2d34f87 100644
--- a/lib/public/command/ibus.php
+++ b/lib/public/command/ibus.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/command/icommand.php b/lib/public/command/icommand.php
index 6ec07575b444a78f061ee1b667335b0a81843170..ed152f4c6c3bcb13c39dc8e2fb86ee963330a4cc 100644
--- a/lib/public/command/icommand.php
+++ b/lib/public/command/icommand.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/exceptions/genericencryptionexception.php b/lib/public/encryption/exceptions/genericencryptionexception.php
index 5648e5edf73a930c829c7d44c51511f423defd67..c1041e816427f72b2c58e802231d2d4d8b49f789 100644
--- a/lib/public/encryption/exceptions/genericencryptionexception.php
+++ b/lib/public/encryption/exceptions/genericencryptionexception.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 975e57744e98fb20d4a36a42d190ff368f33795d..183b322e714a34124de9e1be2944d782ba946b98 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/ifile.php b/lib/public/encryption/ifile.php
index 8b3f0fa4bf32ce0987bf3f123ccc66df35acb590..0d1381238f08a1753370503ade43e11868b69da9 100644
--- a/lib/public/encryption/ifile.php
+++ b/lib/public/encryption/ifile.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php
index 0b12c7524d293ba5fba89c409e4863703cb5bd28..07e2925b76c3c62ea48756a7c8e4ead91f6ccc88 100644
--- a/lib/public/encryption/imanager.php
+++ b/lib/public/encryption/imanager.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/keys/istorage.php b/lib/public/encryption/keys/istorage.php
index 1767781410736bf9657b5b4604587309bc94638b..e206373c46a8d32d9af7ab7d4d4bc418739659de 100644
--- a/lib/public/encryption/keys/istorage.php
+++ b/lib/public/encryption/keys/istorage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/filenametoolongexception.php b/lib/public/files/filenametoolongexception.php
index ccf56e19a6b14786ab4bd2374e89af10f9ba910d..61cb8a21fb60a52974b502f11f8281f81c0acbf0 100644
--- a/lib/public/files/filenametoolongexception.php
+++ b/lib/public/files/filenametoolongexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/invalidcharacterinpathexception.php b/lib/public/files/invalidcharacterinpathexception.php
index a25712353b6477146b7dd3cb23a15065f8eb8e80..52e20dfcb461ca8b9112db0c532f53306b20d73f 100644
--- a/lib/public/files/invalidcharacterinpathexception.php
+++ b/lib/public/files/invalidcharacterinpathexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/reservedwordexception.php b/lib/public/files/reservedwordexception.php
index 0fda9841194f659a7e936870e338bf81cf4e6e9f..fc70c6071851724b6a650e2cefafecb4088ac13f 100644
--- a/lib/public/files/reservedwordexception.php
+++ b/lib/public/files/reservedwordexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index a238b77eb96a29e4cf99161e7beace805d5a7411..c14ca963f93344714d86f2765fefcf09b5ef85e7 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/lib/public/http/client/iclient.php b/lib/public/http/client/iclient.php
index ab907dcfb8258e0f69345a1c133250b4db13287a..aadb9efd1bb232a040f5fe1deb66bcceae54148c 100644
--- a/lib/public/http/client/iclient.php
+++ b/lib/public/http/client/iclient.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/http/client/iclientservice.php b/lib/public/http/client/iclientservice.php
index 2a8bff7bc6943a698f991d1e503090429a6c004b..14dfcc071b8ec22cb57879e737d5a425c192622d 100644
--- a/lib/public/http/client/iclientservice.php
+++ b/lib/public/http/client/iclientservice.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 3a717d1650ced04fdb4b2505afda814fff8e3e50..0e0ef4c50144266d521512e9f96600b8007978c8 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/icertificatemanager.php b/lib/public/icertificatemanager.php
index aeb18fd37f5247ab25e6702ddaf040d6f1c03ea4..b1a16d8b5ee103e9696a0e941e762ee38fbc92de 100644
--- a/lib/public/icertificatemanager.php
+++ b/lib/public/icertificatemanager.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php
index 4f41c808c9f55d6733d3ea78a3fa465dc183dacc..862c77218de9470ee4281cf9350c4a7e4ecf096c 100644
--- a/lib/public/igroupmanager.php
+++ b/lib/public/igroupmanager.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/lib/public/ihelper.php b/lib/public/ihelper.php
index 41fe3f57c0ac5ae0d912ddcd51790f3f3d64f2b3..45a078b6cbce51b4354fab58af77a04d65661c5a 100644
--- a/lib/public/ihelper.php
+++ b/lib/public/ihelper.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/iimage.php b/lib/public/iimage.php
index c62bf36d2dee7fdf7d7fb8cda3eb0c91d142abec..38db14db77c9ca36dc05a3af22d6e9895d3878c1 100644
--- a/lib/public/iimage.php
+++ b/lib/public/iimage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/imemcache.php b/lib/public/imemcache.php
index a1a00791b63a6b5e4634a6740ed442c01cc0f119..01c299030398238721efcbb04c8c673217bae3ce 100644
--- a/lib/public/imemcache.php
+++ b/lib/public/imemcache.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 27702803207d02edc446932d0e7d44dcaeed2189..97ca7f13aa6afebdb97ccaa4f4c127fc7eb44410 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -4,6 +4,7 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 7faeb619fdea88684ddf5bcb96c71e6a4aa8b884..12dbdc1522ac7cdea904341940ccc04dfeb53438 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -1,10 +1,7 @@
 <?php
 /**
  * @author Bernhard Reiter <ockham@raz.or.at>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/public/lock/ilockingprovider.php b/lib/public/lock/ilockingprovider.php
index fd2aa6154527d38c3377721f16c59a3113220aad..f1aa795603379c50127876e31c3f8a409002a95b 100644
--- a/lib/public/lock/ilockingprovider.php
+++ b/lib/public/lock/ilockingprovider.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/lock/lockedexception.php b/lib/public/lock/lockedexception.php
index d6cec4cc48abe9819d15b1666a79710a41300f13..e70713396187912ba3d990683d87c4ac180f0135 100644
--- a/lib/public/lock/lockedexception.php
+++ b/lib/public/lock/lockedexception.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/mail/imailer.php b/lib/public/mail/imailer.php
index 9580104a8bf8d4b7d9daa43aa9b68d5957bd4d09..ac3fe9b0e49a0e44d9af47257b1206b8a2c9b480 100644
--- a/lib/public/mail/imailer.php
+++ b/lib/public/mail/imailer.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/preview/iprovider.php b/lib/public/preview/iprovider.php
index 1a581768ad4002de337eabef550643c19a734e08..821cdb32fa3aebc2c154ac48490c490ca2031a24 100644
--- a/lib/public/preview/iprovider.php
+++ b/lib/public/preview/iprovider.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/response.php b/lib/public/response.php
index 42220e4cf9c98beb2a8c4ccd066300c5120c1e4f..953c797824c45d38dc56dbdcfd6bd2cf4f18f6a9 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -1,7 +1,9 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/public/share.php b/lib/public/share.php
index 797972bc1cbcce3fc8705c9a072c98e25ec16496..86e6deb9194ce4d9ed45aa7147116dcd15ec5935 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -9,6 +9,7 @@
  * @author Michael Kuhn <suraia@ikkoku.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/public/template.php b/lib/public/template.php
index 63079c0fc308e3bf90000ff528da3076a3c26a04..cc91bff2528d4b2a3d3cb47ffc0d4df689ff5520 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Georg Ehrke <georg@ownCloud.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
diff --git a/lib/public/user.php b/lib/public/user.php
index e2413e327839bbb815e2659c965b3bc1301776de..23f77c0a35f2e586f059fb07f7ba9e47671adf1b 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -7,7 +7,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/repair/preview.php b/lib/repair/preview.php
index 28c0ab96683374539c9394e642ac6f58605b37b2..2284da937348968bdbffcc859029d266d9bc2e6d 100644
--- a/lib/repair/preview.php
+++ b/lib/repair/preview.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Georg Ehrke <georg@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/repair/repairlegacystorages.php b/lib/repair/repairlegacystorages.php
index 1bc49678f0db6ab9612e2f14f36ecbb8ae7b0a37..5ba452cbbc6da963ffbfd4847613b8a9a73294b7 100644
--- a/lib/repair/repairlegacystorages.php
+++ b/lib/repair/repairlegacystorages.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index fa6aa1130d6c56169a26d0d45c0dc6e59c5da1fe..89ad0ed16c77efaa6bcf3df1f8be0cdfc0c06bbd 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -1,8 +1,10 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Normal Ra <normalraw@gmail.com>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/repair/sqliteautoincrement.php b/lib/repair/sqliteautoincrement.php
index 79b1fe7870efbce83ccbeb1e4667751a09da0e6b..b8ae5c47ff34b977285ff9f918916131eae27ea1 100644
--- a/lib/repair/sqliteautoincrement.php
+++ b/lib/repair/sqliteautoincrement.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\Repair;
diff --git a/ocs/routes.php b/ocs/routes.php
index 751a16d538e35eebed2f062c6fa29671d83aa732..f8e6f33c48a335262835708278ef43a21c9db490 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
diff --git a/ocs/v1.php b/ocs/v1.php
index 8002ca602e6880e11128e3090e5b7d6f402b6f73..2829cf08c57ba0b3f1ad1ebda86a52c9310dc0cc 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -4,6 +4,7 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/public.php b/public.php
index f390166d06e514d307513cd621f5e2e52cc51876..858e8af778233d8df46fa31f67e0c8fbeadb8727 100644
--- a/public.php
+++ b/public.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/remote.php b/remote.php
index 4db887a0843ebdf41b7da68ee768ad37237ec58c..c1077e42672092506eb0f997a118ccd6ac5d0eb3 100644
--- a/remote.php
+++ b/remote.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/settings/admin.php b/settings/admin.php
index ee252ceb141be95be49c7a4ee4ae36e73afff4bc..533b6152492c6c01cc0fb7827592ae5bec7903b9 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -2,11 +2,13 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index b63bce76d92ddf7309239c586cf4da6a7855870b..69b186bb9f392d85b2ad4d9cb903a5a8fdc185cf 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -4,7 +4,6 @@
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Kamil Domanski <kdomanski@kdemail.net>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 16c7e20955f9c689f7180c73e9e0b7349bda0801..d7c1cbc5a12f0990afd0eb56af1cd54caf14fa65 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f85505b632c1cecf523c497393e0bdf5b2366e04..87b60e485bf41c41a91aea39f2e9baac823dfe28 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 632768ac36862673c94b0266b6223bb814d182f3..767baa9f3eed3e303fbcd10dc8e6182fa442a2ef 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 4541b80056e419fd9a0bb00c809f30c0eba74e1d..5fc88290c91ad5dfb69c2ff228282b15e864135f 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -4,7 +4,6 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/settings/application.php b/settings/application.php
index 920d172c93d25d8d9d7688a402446ee9b8310e64..03203b485644916d54aed70d293ac2ba02b9b653 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -1,8 +1,11 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Georg Ehrke <georg@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 69b7ca710a92b262f6bcf9889cb6c39bb3adaac9..12499ada15d27b05c34620788de3981c9365dcf3 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -2,10 +2,10 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Clark Tomlinson <fallen013@gmail.com>
  * @author cmeh <cmeh@users.noreply.github.com>
  * @author Florin Peter <github@florin-peter.de>
  * @author Jakob Sack <mail@jakobsack.de>
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 3ced5af5a5f5cd74dd9aae6bf3b2db2b4a0ab944..0b4c72acab7365c0c8f25f9f4973e95668425e58 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/groupscontroller.php b/settings/controller/groupscontroller.php
index 6cb0cd3e00855b7822bb70f550e4e492f93d06ad..218a9c0d51c096c000e0988f3af989e002b45c00 100644
--- a/settings/controller/groupscontroller.php
+++ b/settings/controller/groupscontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/settings/controller/logsettingscontroller.php b/settings/controller/logsettingscontroller.php
index f3de1fbb7c6b109842e3d20d007d91204bd50d3c..cae0d419e2bb15d7d3ee2e1e2a25d2884ff2416a 100644
--- a/settings/controller/logsettingscontroller.php
+++ b/settings/controller/logsettingscontroller.php
@@ -2,6 +2,7 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index d0b5267e3c8cc67339d1c4e7279966c9c6be5498..d9b6ba7f7214e67484315aa30a9ba44d135521f0 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/settings/personal.php b/settings/personal.php
index 7bf1110c03e5c67c606139c0c9bf410e029fa974..f4409e633cf316eb9d0f2c7f705b84333f45d54c 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -8,6 +8,7 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/settings/routes.php b/settings/routes.php
index 52b320cbdb55ddbff8821b78308fb2cfd52d2fef..10c3117c183a79ae27e73517f2993d01fcee2c70 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -9,9 +9,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Raghu Nayyar <me@iraghu.com>
- * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/users.php b/settings/users.php
index c438e5fbfd0d1a54cdaf71ac2222bd31c9f69a9c..3d7f39aa367f227d7be5f3413edbf777fb81cfef 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -7,6 +7,7 @@
  * @author Daniel Molkentin <daniel@molkentin.de>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/version.php b/version.php
index 8a61c494bf6bf235199290f9c0e6bd9c80109bd1..1564f451bd354afd24e3ad65dbea5f90bdc0420d 100644
--- a/version.php
+++ b/version.php
@@ -2,7 +2,6 @@
 /**
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0