Merge branch 'develop' into vesting
vesting balance uses balance field more reasonably
progress
progress toward vote
merge
Bump web_wallet
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into automation
generate new test network
Refactor client, move each API to its own .cpp

This was way, way past due.
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Whitespace adjustments
fix input log arguments
Bump qt_wallet
All delegate pay specified in % of 50 new XTS issued per block produced
Merge commit '850aaef85b9bf47f2f65f49e3c602f630f9afc01' into btsx

Conflicts:
	libraries/client/client.cpp
	programs/qt_wallet
	programs/web_wallet
Prepare for merge
Merge branch 'develop' into btsx

Conflicts:
	libraries/blockchain/chain_database.cpp
Add hardfork for delegate pay change
Track total amount each delegate is ever paid
Merge branch 'master' of github.com:dacsunlimited/bitsharesx into btsx