opentxs/stable_client sync
Merge pull request #116 from yamamushi/develop

opentxs/stable_client sync