Merge branch 'master' into not-escape-enum-value

Conflicts:
	modules/swagger-codegen/src/main/resources/Java/enumClass.mustache

modules/swagger-codegen/src/main/resources/Java/enumClass.mustache

@@ -1,3 +1,4 @@
+
 public enum {{{datatypeWithEnum}}} {
   {{#allowableValues}}{{#enumVars}}{{{name}}}("{{{value}}}"){{^-last}},
   {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}{{/allowableValues}}
@@ -9,6 +10,7 @@ public enum {{{datatypeWithEnum}}} {
   }
 
   @Override
+  @JsonValue
   public String toString() {
     return value;
   }

modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache

@@ -98,8 +98,8 @@ ext {
 dependencies {
     compile "com.squareup.okhttp:okhttp:$okhttp_version"
     compile "com.squareup.retrofit:retrofit:$retrofit_version"
-    compile 'com.google.code.gson:gson:$gson_version'
-    compile 'com.squareup.retrofit:converter-gson:$retrofit_version'
+    compile "com.google.code.gson:gson:$gson_version"
+    compile "com.squareup.retrofit:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     testCompile "junit:junit:$junit_version"

modules/swagger-codegen/src/main/resources/Java/model.mustache

@@ -9,7 +9,7 @@ import java.io.Serializable;{{/serializableModel}}
 import java.util.Objects;
 
 import io.swagger.annotations.*;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
 {{#models}}
 
 {{#model}}{{#description}}