Merge branch 'develop' into feature/option-scripts

# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php

app/Http/Controllers/Daemon/PackController.php

@@ -31,19 +31,12 @@ use Pterodactyl\Http\Controllers\Controller;
 
 class PackController extends Controller
 {
-    /**
-     * Controller Constructor.
-     */
-    public function __construct()
-    {
-        //
-    }
-
     /**
      * Pulls an install pack archive from the system.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string                    $uuid
+     * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
     public function pull(Request $request, $uuid)
     {
@@ -63,8 +56,9 @@ class PackController extends Controller
     /**
      * Returns the hash information for a pack.
      *
-     * @param  \Illuminate\Http\Request   $request
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string                    $uuid
+     * @return \Illuminate\Http\JsonResponse
      */
     public function hash(Request $request, $uuid)
     {
@@ -87,9 +81,10 @@ class PackController extends Controller
      * Pulls an update pack archive from the system.
      *
      * @param  \Illuminate\Http\Request   $request
-     * @return \Illuminate\Http\Response
+     * @return void
      */
     public function pullUpdate(Request $request)
     {
+        //
     }
 }

app/Http/Controllers/Daemon/ServiceController.php

@@ -36,7 +36,7 @@ class ServiceController extends Controller
      * as well as the associated files and the file hashes for
      * caching purposes.
      *
-     * @param  \Illuminate\Http\Request   $request
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function list(Request $request)
@@ -77,7 +77,7 @@ class ServiceController extends Controller
      * Returns a `main.json` file based on the configuration
      * of each service option.
      *
-     * @param  int     $id
+     * @param  int  $id
      * @return \Illuminate\Support\Collection
      */
     protected function getConfiguration($id)