Merge branch 'develop' into feature/option-scripts

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

app/Repositories/OptionRepository.php

@@ -73,7 +73,7 @@ class OptionRepository
     /**
      * Deletes a service option from the system.
      *
-     * @param  int    $id
+     * @param  int  $id
      * @return void
      *
      * @throws \Pterodactyl\Exceptions\DisplayException