Merge branch '2.x' into 2.6

bower.json

@@ -2,9 +2,14 @@
     "name": "jquery.inputmask",
     "version": "2.4.18",
     "main": "./dist/jquery.inputmask.bundle.js",
+	"keywords" : ["jQuery", "plugins", "input", "form", "inputmask", "mask"],
 	"description": "jquery.inputmask is a jquery plugin which create an input mask.",
 	"license": "http://opensource.org/licenses/mit-license.php",
     "dependencies": {
         "jquery": ">=1.7"
-    }
+    },
+	"authors": [ 
+		{ "name": "Robin Herbots" }
+	],
+	"homepage": "http://robinherbots.github.io/jquery.inputmask"
 }