Merge branch 'feature/api-permissions' of https://github.com/Pterodactyl/Panel into feature/api-permissions

Author: DaneEveritt

database/migrations/2018_01_13_142012_SetupTableForKeyEncryption.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -45,7 +45,7 @@ public function up()
      */
     public function down()
     {
-        /** @var \Pterodactyl\Models\APIKey $key */
+        /* @var \Pterodactyl\Models\APIKey $key */
         DB::transaction(function () {
             foreach (DB::table('api_keys')->cursor() as $key) {
                 DB::table('api_keys')->where('id', $key->id)->update([