Merge branch 'master' into github

Author: josh

package.json

@@ -0,0 +1,17 @@
+{
+  "name": "braintree-encryption",
+  "description": "Javascript Library for Client-side Encryption with Braintree",
+  "version": "1.3.10",
+  "main": "target/braintree-1.3.10.js",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:braintree/braintree-encryption.js"
+  },
+  "keywords": [
+    "braintree",
+    "payments"
+  ],
+  "author": "braintree <code@getbraintree.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/braintree/braintree-encryption.js"
+}