Merge branch 'master' into ui-2

# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

scripts/cov.sh

@@ -21,7 +21,7 @@ if ! type $KCOV > /dev/null; then
 fi
 
 . ./scripts/targets.sh
-cargo test $TARGETS --no-run || exit $?
+RUSTFLAGS="-C link-dead-code" cargo test $TARGETS --no-run || exit $?
 
 
 KCOV_TARGET="target/cov"
@@ -31,14 +31,7 @@ EXCLUDE="/usr/lib,\
 $HOME/.cargo,\
 $HOME/.multirust,\
 rocksdb,\
-secp256k1,\
-util/json-tests,\
-util/src/network/tests,\
-ethcore/src/evm/tests,\
-ethstore/tests,\
-target/debug/build,\
-target/release/build,\
-*.db
+secp256k1
 "
 
 rm -rf $KCOV_TARGET