Revert "utility to convert bitcoin pubkey into btsx pubkey"
Refactor bts_genesis_to_cpp.cpp to use template prologue and epilogue
Rename bts_genesis_to_cpp -> bts_json_to_cpp
Merge pull request #735 from xeroc/revert-734-master

Revert "utility to convert bitcoin pubkey into btsx pubkey"
Add wallet API calls for creating and opening mail

The wallet can now create an email to a recipient, and as that
recipient, open said mail.
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Restore missing change from downstream
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Ostensibly add filtered shorts to third pane in order book
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Don't filter shorts in backend
Merge branch 'master' into develop
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
Merge pull request #739 from drltc/genesis_refactor

Refactor bts_genesis_to_cpp.cpp to use template prologue and epilogue
Update .gitignore
Remove unused variables
Merge branch 'develop' of github.com:BitShares/bitshares_toolkit into develop
restrict new shorts to within 10 percent
only check depth on bit asset vs XTS
Merge branch 'develop' into btsx

Conflicts:
	libraries/blockchain/CMakeLists.txt
	libraries/blockchain/market_engine.cpp