Merge remote-tracking branch 'upstream/master' into fix-no-content

Conflicts:
	samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java

samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java

@@ -146,4 +146,3 @@ public class ApiInvoker {
     return hostMap.get(host);
   }
 }
-

samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java

@@ -10,6 +10,7 @@ public class Order {
   private Integer quantity = null;
   /* Status of the order */
   private String status = null;
+  //public enum statusEnum { placed,  approved,  delivered, }; 
   /* Date shipped, only if it has been */
   private Date shipDate = null;
   public Long getId() {

samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java

@@ -16,6 +16,7 @@ public class Pet {
   private List<Tag> tags = new ArrayList<Tag>();
   /* pet status in the store */
   private String status = null;
+  //public enum statusEnum { available, pending, sold, }; 
   public Long getId() {
     return id;
   }

samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java

@@ -17,6 +17,7 @@ public class User {
   private String phone = null;
   /* User Status */
   private Integer userStatus = null;
+  //public enum userStatusEnum { 1-registered, 2-active, 3-closed, }; 
   public Long getId() {
     return id;
   }