diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
index 22f198533bf..297e1360c70 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
index 30f7e83c971..966a141c03d 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -51,8 +51,11 @@ public class ApiInvoker {
   }
 
   public static Object deserialize(String json, String containerType, Class cls) throws ApiException {
+    if(null != containerType) {
+        containerType = containerType.toLowerCase();
+    }
     try{
-      if("List".equals(containerType)) {
+      if("list".equals(containerType) || "array".equals(containerType)) {
         JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls);
         List response = (List<?>) JsonUtil.getJsonMapper().readValue(json, typeInfo);
         return response;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
index 22f198533bf..297e1360c70 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Category;
-import java.util.*;
 import io.swagger.client.model.Tag;
+import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/samples/client/petstore/objc/client/SWGPet.h b/samples/client/petstore/objc/client/SWGPet.h
index b6339cf127c..f16fa74cf1e 100644
--- a/samples/client/petstore/objc/client/SWGPet.h
+++ b/samples/client/petstore/objc/client/SWGPet.h
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "SWGObject.h"
-#import "SWGCategory.h"
 #import "SWGTag.h"
+#import "SWGCategory.h"
 
 
 @interface SWGPet : SWGObject
diff --git a/samples/client/petstore/tizen/client/SamiOrder.h b/samples/client/petstore/tizen/client/SamiOrder.h
index d93510f48a9..88dcda67395 100644
--- a/samples/client/petstore/tizen/client/SamiOrder.h
+++ b/samples/client/petstore/tizen/client/SamiOrder.h
@@ -17,11 +17,11 @@
 using namespace Tizen::Web::Json;
 
 
-using Tizen::Base::Integer;
 using Tizen::Base::Long;
+using Tizen::Base::DateTime;
 using Tizen::Base::String;
 using Tizen::Base::Boolean;
-using Tizen::Base::DateTime;
+using Tizen::Base::Integer;
 
 
 namespace Swagger {
diff --git a/samples/client/petstore/tizen/client/SamiPet.h b/samples/client/petstore/tizen/client/SamiPet.h
index b1f912bd912..9e3ab43bdc7 100644
--- a/samples/client/petstore/tizen/client/SamiPet.h
+++ b/samples/client/petstore/tizen/client/SamiPet.h
@@ -17,9 +17,9 @@
 using namespace Tizen::Web::Json;
 
 
+#include "SamiCategory.h"
 using Tizen::Base::Long;
 using Tizen::Base::String;
-#include "SamiCategory.h"
 #include "SamiTag.h"
 using Tizen::Base::Collection::IList;
 
diff --git a/samples/client/petstore/tizen/client/SamiUser.h b/samples/client/petstore/tizen/client/SamiUser.h
index 585f52d4a02..dd24429dbab 100644
--- a/samples/client/petstore/tizen/client/SamiUser.h
+++ b/samples/client/petstore/tizen/client/SamiUser.h
@@ -17,9 +17,9 @@
 using namespace Tizen::Web::Json;
 
 
-using Tizen::Base::Integer;
 using Tizen::Base::Long;
 using Tizen::Base::String;
+using Tizen::Base::Integer;
 
 
 namespace Swagger {
diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/dynamic-html/docs/assets/images/logo.png
index 9ad1ffa77ff..7a217967d00 100644
Binary files a/samples/dynamic-html/docs/assets/images/logo.png and b/samples/dynamic-html/docs/assets/images/logo.png differ
diff --git a/samples/dynamic-html/docs/index.html b/samples/dynamic-html/docs/index.html
index 1b7ba98febb..22ed5d50b68 100644
--- a/samples/dynamic-html/docs/index.html
+++ b/samples/dynamic-html/docs/index.html
@@ -58,25 +58,6 @@
           </ul>
         </div>
         
-        <div class="section-box">
-          <div class="section-header">
-            <a href="#!/StoreApi">StoreApi</a>
-          </div>
-          <ul>
-			      
-			      
-            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
-            
-            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
-            
-            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
-            
-            <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
-            
-            
-          </ul>
-        </div>
-        
         <div class="section-box">
           <div class="section-header">
             <a href="#!/PetApi">PetApi</a>
@@ -104,6 +85,25 @@
           </ul>
         </div>
         
+        <div class="section-box">
+          <div class="section-header">
+            <a href="#!/StoreApi">StoreApi</a>
+          </div>
+          <ul>
+			      
+			      
+            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
+            
+            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
+            
+            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
+            
+            <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
+            
+            
+          </ul>
+        </div>
+        
         
       </div>
     <div class="non-sidebar">
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
index 9596181628e..5a5cc2c8fb0 100644
--- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java
@@ -1,8 +1,8 @@
 package io.swagger.model;
 
 import io.swagger.model.Category;
-import java.util.*;
 import io.swagger.model.Tag;
+import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
 import com.fasterxml.jackson.annotation.JsonProperty;