Merge branch 'master' of github.com:novacoin-project/novacoin

diff --cc src/bitcoinrpc.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/rpcwallet.cpp
Simple merge

diff --cc src/wallet.cpp
Simple merge