merge develop to master#8

Merged

tronfoundation merged 44 commits intomasterfrom

Dec 28, 2017

Commits on Dec 20, 2017

Merge pull request #4 from tron-network/master
lucien-tronlab
authored

Commits on Dec 21, 2017

Commits on Dec 24, 2017

add kafka config
572201193
committed
Merge pull request #9 from 572201193/develop
lucien-tronlab
authored

Commits on Dec 25, 2017

wallet
zhangzhongwen_007@foxmail.com
committed
Merge branch 'develop' into feature/wallet
zhangzhongwen_007@foxmail.com
committed
db test
yangchang
committed
modify kafka default host
sasaxie
committed
merage and fix consensus
conglinduye
committed
Merge remote-tracking branch 'upstream/master' into feature/contract
yangchang
committed
db test
yangchang
committed
Merge remote-tracking branch 'origin/feature/consensus' into feature/contract
yangchang
committed
db test
yangchang
committed
Merge pull request #15 from tron-network/feature/contract
mu1one
authored

Commits on Dec 26, 2017

Commits on Dec 27, 2017

Commits on Dec 28, 2017

docs(README.md): update how to run project
tronfoundation
authored