Conflicts:
	Cargo.lock
	rpc/src/v1/tests/mocked/parity_accounts.rs

add js-test as diff

Set default min tx price to $0.0025

Use accountsInfo instead of eth_accounts for first check

Fix Copy to Clipboard Snackbar

* Manually add \r to Windows phrases pre 1.4.4

* < 1.4.5

* Only support 1.4.x dictionary

* Use variables for signer form widths

* Simplify signer layouts with flex

* Fix styling issues with Signer

* Fix rendering when contract is empty

* Add registration dapp to app list

Nicolas Gotchac authored Nov 25, 2016 and Jaco Greeff committed Nov 25, 2016

* Smarter dApps Manifest fetching...

* Fetching only visible accounts (and don't delete other balances) #3590

* Moved balances action into BalancesActions #3590

* Fetch balances for accounts and contracts #3590

* Add balances to contract/address/account views #3590

* Fix transaction not fetching on first load

* Remove console.warn

* Fix pending tokens not showing #3154

* Fix tokens image update

* Remove unused name in Header

* Separate Tokens and ETH fetching #3590

* Remove unused isTest

* Fetch Tokens Balance via Filter #3590

* Fix linting

* Fix updating tokens image (#3590)

* Fix contract balances

* Improved Status

* Fixing secureApi issues...

* Fetch all tokens every 2 minutes (for safety) #3590

* PR changes fix

* Fix Account error

Dapp iframe allow forms, allow target=_blank

Conflicts:
	Cargo.lock

align copy button to input field

Check for network ID for live/test matching

if fix

small fix for test's and js-build

https://github.com/ethcore/parity/issues/3185

[ci skip]
add darwin installer in master

Always insert traces for genesis.

Real deleting accounts

Trim whitespace from input recovery phrase

close https://github.com/ethcore/parity/issues/3515