Merge pull request swagger-api#1054 from tomaszszlek/develop_2.0

Added handling url format as a string type swagger-api#1045

Author: fehguy

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/StringProperty.java

@@ -87,7 +87,8 @@ public void setDefault(String _default) {
 
   //TODO: implement additional formats
   public static boolean isType(String type, String format) {
-    if("string".equals(type) && (format == null || "uri".equals(format) || "byte".equals(format)))
+    boolean formatMatchStringType = "uri".equals(format) || "byte".equals(format) || "url".equals(format);
+    if("string".equals(type) && (format == null || formatMatchStringType))
       return true;
     else return false;
   }