Merge remote-tracking branch 'remotes/origin/newminer'

diff --cc src/kernel.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/rpcwallet.cpp
Simple merge

diff --cc src/wallet.cpp
Simple merge