Merge branch '1.x' into 2.x

README.md

@@ -371,10 +371,10 @@ PM> Install-Package jQuery.InputMask
 In App_Start, BundleConfig.cs
 ```c#
 bundles.Add(new ScriptBundle("~/bundles/inputmask").Include(
-                        "~/Scripts/jquery.inputmask.js",
-						"~/Scripts/jquery.inputmask.extensions.js",
-						"~/Scripts/jquery.inputmask.date.extensions.js",
-						"~/Scripts/jquery.inputmask.numeric.extensions.js"));
+                        "~/Scripts/jquery.inputmask/jquery.inputmask.js",
+						"~/Scripts/jquery.inputmask/jquery.inputmask.extensions.js",
+						"~/Scripts/jquery.inputmask/jquery.inputmask.date.extensions.js",
+						"~/Scripts/jquery.inputmask/jquery.inputmask.numeric.extensions.js"));
 ```
 
 In Layout

js/jquery.inputmask.extensions.js

@@ -89,7 +89,7 @@ Optional extensions on the jquery.inputmask base
                     cardinality: 3,
                     prevalidator: [
                                 { validator: "[0-2]", cardinality: 1 },
-                                { validator: "2[0-5]|[01][0-9]", cardinality: 2 },
+                                { validator: "2[0-5]|[01][0-9]", cardinality: 2 }
                     ]
                 }
             }

nuget/jquery.inputmask.nuspec

@@ -28,9 +28,13 @@ Highlights:
         <tags>jQuery, plugins</tags>
     </metadata>
     <files>
-        <file src="..\js\jquery.inputmask.date.extensions.js" target="content\Scripts\jquery.inputmask.date.extensions.js" />
-        <file src="..\js\jquery.inputmask.extensions.js" target="content\Scripts\jquery.inputmask.extensions.js" />
-        <file src="..\js\jquery.inputmask.numeric.extensions.js" target="content\Scripts\jquery.inputmask.numeric.extensions.js" />
-        <file src="..\js\jquery.inputmask.js" target="content\Scripts\jquery.inputmask.js" />
+        <file src="..\js\jquery.inputmask.date.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.date.extensions.js" />
+        <file src="..\js\jquery.inputmask.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.extensions.js" />
+        <file src="..\js\jquery.inputmask.numeric.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.numeric.extensions.js" />
+        <file src="..\js\jquery.inputmask.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.js" />
+		<file src="..\dist\min\jquery.inputmask.date.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.date.extensions.min.js" />
+        <file src="..\dist\min\jquery.inputmask.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.extensions.min.js" />
+        <file src="..\dist\min\jquery.inputmask.numeric.extensions.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.numeric.extensions.min.js" />
+        <file src="..\dist\min\jquery.inputmask.js" target="content\Scripts\jquery.inputmask\jquery.inputmask.min.js" />
     </files>
 </package>