new_testnet reads bts_snapshot from file
fix setting vesting balances
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop
Issue #910 - paying fee with any valid asset type

Pay fee with any asset type that has already been involved with a
transaction.  This will allow fees to be paid in BitUSD rather than
XTS.
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop
more vesting progress
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop
fix pts addresses and test vesting withdraw
Rename fork block constants
ifdef out #warning for WIN32 to compile

Conflicts:
	libraries/blockchain/balance_operations.cpp
	libraries/blockchain/chain_database.cpp
Update client fork timestamps
Update submodules
Merge branch 'develop' into bitshares

Conflicts:
	programs/web_wallet
Fix chain id after merge
Clean up some hardfork handling code
Update checkpoints