Merge branch 'master' into ui-2

.gitignore

@@ -21,6 +21,7 @@
 
 # npm stuff
 npm-debug.log
+node_modules
 
 # gdb files
 .gdb_history

js/package.json

@@ -48,7 +48,7 @@
     "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed",
     "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app",
     "start:app": "node webpack/dev.server",
-    "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache",
+    "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache ./node_modules/@parity",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
     "lint": "npm run lint:css && npm run lint:js",
     "lint:cached": "npm run lint:css && npm run lint:js:cached",

node_modules/.yarn-integrity

@@ -1 +0,0 @@
-549854b8a60607db81d4c58008d59f812d744acba026266f380acd942941356a

yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-