Merge branch 'master' into jg-test-ui

Cargo.lock

@@ -1271,7 +1271,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#1690a80b9f56e33c8344f28eb637bacd97c9da14"
+source = "git+https://github.com/ethcore/js-precompiled.git#e5eabdb4f30e9c6bf9b7cb98f0029a71ba202a19"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.2.97",
+  "version": "0.2.98",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

js/scripts/release.sh

@@ -35,13 +35,15 @@ git checkout -b $BRANCH
 
 echo "*** Committing compiled files for $UTCDATE"
 mv build ../build.new
-git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
-git rm build/*
-git commit -m "$UTCDATE [rm]"
-mv -f ../build.new/* build/
-rm -rf ../build.new
 git add .
-git commit -m "$UTCDATE"
+git commit -m "$UTCDATE [update]"
+git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
+git rm -r build
+rm -rf build
+git commit -m "$UTCDATE [cleanup]"
+mv ../build.new build
+git add .
+git commit -m "$UTCDATE [release]"
 
 echo "*** Merging remote"
 git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG

js/scripts/test.js

@@ -0,0 +1 @@
+// test script 4