Merge conflict

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cyberchef",
-  "version": "5.1.3",
-  "description": "CyberChef is a simple, intuitive web app for analysing and decoding data within a web browser.",
+  "version": "5.3.0",
+  "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
   "copyright": "Crown copyright 2016",
@@ -19,12 +19,16 @@
     "hex",
     "encoding",
     "format",
-    "cybersecurity"
+    "cybersecurity",
+    "data manipulation",
+    "data analysis"
   ],
   "repository": {
     "type": "git",
     "url": "https://github.com/gchq/CyberChef/"
   },
+  "main": "build/node/CyberChef.js",
+  "bugs": "https://github.com/gchq/CyberChef/issues",
   "devDependencies": {
     "babel-core": "^6.24.0",
     "babel-loader": "^6.4.0",
@@ -68,6 +72,7 @@
     "jquery": "^3.1.1",
     "jsbn": "^1.1.0",
     "jsrsasign": "^7.1.0",
+    "lodash": "^4.17.4",
     "moment": "^2.17.1",
     "moment-timezone": "^0.5.11",
     "sladex-blowfish": "^0.8.1",