Cleanup
Merge branch 'cleanup' into upstream

Conflicts:
	libraries/blockchain/chain_database.cpp
	libraries/blockchain/include/bts/blockchain/chain_database.hpp
	libraries/wallet/wallet.cpp
Merge branch 'master' of github.com:BitShares/bitshares_toolkit
Replace uint160 with appropriate typedefs for trx and block hashes
Implement displaying transaction history
Merge branch 'master' of github.com:BitShares/bitshares_toolkit

Conflicts:
	libraries/cli/cli.cpp
	libraries/wallet/include/bts/wallet/wallet.hpp
	libraries/wallet/wallet.cpp
Fix CLI wallet opening error
Enhance transaction history printing in CLI
Merge branch 'master' of github.com:BitShares/bitshares_toolkit

Conflicts:
	libraries/blockchain/transaction_validator.cpp
Merge pull request #53 from vikramrajkumar/master

Improve CLI transaction history + fix wallet opening error + lots of cleanup
Import WIF private keys
Allow showing only most recent N transactions in history list
Fix alignment bug
Merge pull request #54 from vikramrajkumar/master

Minor CLI enhancements
Merge pull request #24 from BitShares/master

Merge from Remote:BitShares