Merge branch '2.x' into 2.6

bower.json

@@ -0,0 +1,26 @@
+{
+    "name": "jquery.inputmask",
+    "version": "2.4.15",
+    "main": "./dist/jquery.inputmask.bundle.js",
+	"description": "jquery.inputmask is a jquery plugin which create an input mask.
+
+An inputmask helps the user with the input by ensuring a predefined format. This can be useful for dates, numerics, phone numbers, ...
+
+Highlights:
+- easy to use
+- optional parts anywere in the mask
+- possibility to define aliases which hide complexity
+- date / datetime masks
+- numeric masks
+- lots of callbacks
+- non-greedy masks
+- many features can be enabled/disabled/configured by options
+- supports readonly/disabled/dir="rtl" attributes
+- support data-inputmask attribute
+- multi-mask support
+- regex-mask support",
+	"license": "http://opensource.org/licenses/mit-license.php",
+    "dependencies": {
+        "jquery": ">=1.7"
+    }
+}

build.xml

@@ -20,7 +20,7 @@
 	   <replaceregexp file="${srcdir}/jquery.inputmask.regex.extensions.js" match="Version:.*" replace="Version: ${build.major}.${build.minor}.${build.revision}"  byline="true"/>
 	   <replaceregexp file="${srcdir}/jquery.inputmask.phone.extensions.js" match="Version:.*" replace="Version: ${build.major}.${build.minor}.${build.revision}"  byline="true"/>
 	   <replaceregexp file="./jquery.inputmask.jquery.json" match="&quot;version&quot;:.*" replace="&quot;version&quot;: &quot;${build.major}.${build.minor}.${build.revision}&quot;,"  byline="true"/>
-	   <replaceregexp file="./component.json" match="&quot;version&quot;:.*" replace="&quot;version&quot;: &quot;${build.major}.${build.minor}.${build.revision}&quot;,"  byline="true"/>
+	   <replaceregexp file="./bower.json" match="&quot;version&quot;:.*" replace="&quot;version&quot;: &quot;${build.major}.${build.minor}.${build.revision}&quot;,"  byline="true"/>
 	</target>
 
 	<target name="resetVersions">

component.json

@@ -1,8 +0,0 @@
-{
-    "name": "jquery.inputmask",
-    "version": "2.4.15",
-    "main": "./dist/jquery.inputmask.bundle.js",
-    "dependencies": {
-        "jquery": ">=1.7"
-    }
-}