Merge branch 'develop' of github.com:Pterodactyl/wings into develop

# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go

command/root.go

@@ -26,7 +26,7 @@ var RootCommand = &cobra.Command{
 var configPath string
 
 func init() {
-	RootCommand.Flags().StringVarP(&configPath, "config", "c", "./config.json", "Allows to set the path of the configuration file.")
+	RootCommand.Flags().StringVarP(&configPath, "config", "c", "./config.yml", "Allows to set the path of the configuration file.")
 }
 
 // Execute registers the RootCommand