bump testnet
Restore upped gcc min version to gcc 4.8 now that we're not running
testnets on the ancient bitshares.org server anymore
Remove warnings for already merged hardfork changes
Improve replay_chain_database test -- make it able to collect detailed statistics about the size of blockchain databases.
ifdef out the test I accidentally enabled in the last commit
blockchain_market_order_book defaults to showing only 10 orders
wallet_market_add_collateral now takes an asset string rather than a
share_type
[hardfork] Add support for bid/ask in same trx

In the event a transaction specified a bid op and an ask op at the same
time it would fail to validate because of asset opperator += mismatch.

This will hard fork in the event that someone actually creates a
transaction that does this (ie: by using the market maker bot).

This expands the set of valid transactions, but does not invalidate past
transactions.
Merge branch 'develop' into btsx
Handle upstream softfork
Set next hardfork block num
Restore BTSX delegate pay system
Fix build
Merge branch 'dilution' into btsx

Conflicts:
	libraries/blockchain/chain_database.cpp
Remove merge warning
Update Ubuntu build instructions from downstream
Only allow using the base asset as short collateral
Merge branch 'dilution' into btsx

Conflicts:
	BUILD_UBUNTU.md
	libraries/blockchain/chain_database.cpp
	libraries/blockchain/market_operations.cpp
Disable unsupported operations
Merge branch 'dilution' into btsx

Conflicts:
	libraries/blockchain/account_operations.cpp
	libraries/blockchain/balance_operations.cpp