merge

@@ -31,4 +31,4 @@ class Controller_Product extends Controller_Abstract
          $products = Facade_Prod::getProd($recomStatus, $offset, $limit);
          return $this->returnJson(true, 200, $products, '');     
     }
-}
\ No newline at end of file
+}