Merge branch 'octobroid:master' into develop

Author: jacksun101

classes/ApiController.php

@@ -48,9 +48,11 @@ public function __construct(Manager $fractal)
         $this->input = request()->isJson() ? request()->json() : request();
         $this->data = $this->input->all();
 
+        // Always add CORS for every request
+        header("Access-Control-Allow-Origin: *");
+
         // Handle error
         App::error(function(\Exception $e) {
-            header("Access-Control-Allow-Origin: *");
             $trace = $e->getTraceAsString();
 
             $error = [

classes/Transformer.php

@@ -149,12 +149,12 @@ protected function files($files)
         return $result;
     }
 
-    protected function images($files, Array $customSizes = [])
+    protected function images($files, Array $customSizes = [], $replace = false)
     {
         $result = [];
 
         foreach ($files as $file) {
-            $result[] = $this->image($file);
+            $result[] = $this->image($file, $customSizes, $replace);
         }
 
         return $result;