Merge pull request #47 from maticnetwork/develop

cmd/bor/config.go

cmd/bor/main.go

cmd/bor/usage.go

cmd/puppeth/wizard_genesis.go

cmd/utils/flags.go

consensus/bor/bor.go

consensus/bor/bor_test/genesis.json

eth/backend.go

eth/config.go

params/config.go