Update BUILD_UBUNTU.md
Merge pull request #69 from bitcoiners/patch-2

Update BUILD_UBUNTU.md
Merge pull request #70 from vikramrajkumar/btsx

Merge upstream
[GS] Regression tests - add wallet_market_matchup_test 2
[GS] canonical() is replaced by absolute(), because canonical throws exception if file do not exists. This happens when creating logs. fixed #819
Merge branch 'develop' of https://github.com/BitShares/bitshares_toolkit into develop
Complete (I think) the implementation of batch_market_update

It's completely untested. If you want to use it, test it first. I make
no promises.
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Minor refactor circa transaction_builder
A couple bug fixes circa transaction_builder
print bids/asks in order
upgrading delegate pay rate and registration fee
Only print shorts for QUOTE/XTS pairs...
Merge commit 'f852f21fc160c5d92fb5c3d4e59e0b66408f82f6' into btsx

Conflicts:
	libraries/blockchain/chain_database.cpp
	programs/qt_wallet
	programs/web_wallet
Revert upstream pay rate changes
Fixes to reflect new delegate pay rate mechanism
Merge commit '9162f7a6723099a362f7bc1b7a8511270ddb2144' into btsx
Only print shorts for QUOTE/XTS pairs...
Minor cleanup
Update .gitignore