wallet name change
Merge branch 'macoin2.0.0' of https://github.com/vipwzw/bitcoin into macoin2.0.0

Conflicts:
	src/qt/bitcoinstrings.cpp
	src/rpcnet.cpp