Fixed names
Merge branch 'master' of https://github.com/ileathan/zmark

Conflicts:
	Makefile
	Makefile.am
	Makefile.in
	README.md
	aclocal.m4
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	config.log
	configure.ac
	contrib/devtools/README.md
	contrib/devtools/update-translations.py
	contrib/gitian-descriptors/deps-linux.yml
	contrib/gitian-descriptors/deps-win.yml
	contrib/gitian-descriptors/gitian-linux.yml
	contrib/gitian-descriptors/gitian-win.yml
	contrib/gitian-descriptors/qt-win.yml
	contrib/qt_translations.py
	contrib/seeds/README.md
	contrib/spendfrom/README.md
	contrib/spendfrom/setup.py
	contrib/spendfrom/spendfrom.py
	contrib/testgen/base58.py
	doc/Doxyfile
	doc/README.md
	doc/README_windows.txt
	doc/assets-attribution.md
	doc/bootstrap.md
	doc/build-msw.md
	doc/build-osx.md
	doc/build-unix.md
	doc/coding.md
	doc/multiwallet-qt.md
	doc/release-process.md
	doc/tor.md
	doc/translation_process.md
	doc/unit-tests.md
	qa/pull-tester/build-tests.sh
	qa/pull-tester/build-tests.sh.in
	qa/pull-tester/pull-tester.py
	qa/pull-tester/pull-tester.sh
	qa/rpc-tests/README.md
	qa/rpc-tests/listtransactions.py
	qa/rpc-tests/python-bitcoinrpc/setup.py
	qa/rpc-tests/skeleton.py
	qa/rpc-tests/txnmall.sh
	qa/rpc-tests/util.py
	qa/rpc-tests/util.sh
	qa/rpc-tests/walletbackup.sh
	share/qt/Info.plist
	share/qt/Info.plist.in
	share/qt/extract_strings_qt.py
	share/qt/make_icons.sh
	share/setup.nsi
	share/setup.nsi.in
	share/ui.rc
	src/.deps/addrman.Po
	src/.deps/alert.Po
	src/.deps/base58.Po
	src/.deps/bloom.Po
	src/.deps/chainparams.Po
	src/.deps/checkpoints.Po
	src/.deps/coins.Po
	src/.deps/core.Po
	src/.deps/crypter.Po
	src/.deps/db.Po
	src/.deps/hash.Po
	src/.deps/init.Po
	src/.deps/key.Po
	src/.deps/keystore.Po
	src/.deps/leveldbwrapper.Po
	src/.deps/main.Po
	src/.deps/miner.Po
	src/.deps/net.Po
	src/.deps/netbase.Po
	src/.deps/noui.Po
	src/.deps/protocol.Po
	src/.deps/rpcblockchain.Po
	src/.deps/rpcclient.Po
	src/.deps/rpcdump.Po
	src/.deps/rpcmining.Po
	src/.deps/rpcmisc.Po
	src/.deps/rpcnet.Po
	src/.deps/rpcprotocol.Po
	src/.deps/rpcrawtransaction.Po
	src/.deps/rpcserver.Po
	src/.deps/rpcwallet.Po
	src/.deps/script.Po
	src/.deps/scrypt.Po
	src/.deps/sync.Po
	src/.deps/txdb.Po
	src/.deps/txmempool.Po
	src/.deps/util.Po
	src/.deps/version.Po
	src/.deps/wallet.Po
	src/.deps/walletdb.Po
	src/Makefile
	src/Makefile.am
	src/Makefile.in
	src/Makefile.include
	src/clientversion.h
	src/coins.h
	src/compat/glibc_compat.cpp
	src/init.cpp
	src/main.cpp
	src/main.h
	src/miner.cpp
	src/net.cpp
	src/netbase.h
	src/qt/Makefile
	src/qt/Makefile.am
	src/qt/Makefile.in
	src/qt/addressbookpage.cpp
	src/qt/addresstablemodel.cpp
	src/qt/askpassphrasedialog.cpp
	src/qt/coincontroldialog.cpp
	src/qt/forms/aboutdialog.ui
	src/qt/forms/addressbookpage.ui
	src/qt/forms/helpmessagedialog.ui
	src/qt/forms/optionsdialog.ui
	src/qt/forms/receivecoinsdialog.ui
	src/qt/forms/rpcconsole.ui
	src/qt/forms/sendcoinsdialog.ui
	src/qt/forms/sendcoinsentry.ui
	src/qt/forms/signverifymessagedialog.ui
	src/qt/guiconstants.h
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/intro.cpp
	src/qt/notificator.h
	src/qt/openuridialog.cpp
	src/qt/optionsdialog.cpp
	src/qt/optionsmodel.cpp
	src/qt/overviewpage.cpp
	src/qt/paymentrequest.proto
	src/qt/paymentserver.cpp
	src/qt/paymentserver.h
	src/qt/qvalidatedlineedit.cpp
	src/qt/receivecoinsdialog.cpp
	src/qt/receivecoinsdialog.h
	src/qt/receiverequestdialog.cpp
	src/qt/recentrequeststablemodel.cpp
	src/qt/recentrequeststablemodel.h
	src/qt/res/src/inout.svg
	src/qt/res/src/questionmark.svg
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/qt/sendcoinsentry.cpp
	src/qt/sendcoinsentry.h
	src/qt/signverifymessagedialog.cpp
	src/qt/test/.deps/test_zmark_qt-moc_paymentservertests.Po
	src/qt/test/.deps/test_zmark_qt-paymentservertests.Po
	src/qt/test/.deps/test_zmark_qt-test_main.Po
	src/qt/test/.deps/test_zmark_qt-uritests.Po
	src/qt/test/Makefile
	src/qt/test/Makefile.in
	src/qt/test/test_main.cpp
	src/qt/test/uritests.cpp
	src/qt/transactiondesc.cpp
	src/qt/transactiontablemodel.cpp
	src/qt/transactionview.cpp
	src/qt/utilitydialog.cpp
	src/qt/walletframe.cpp
	src/qt/walletmodel.cpp
	src/qt/walletview.cpp
	src/qt/walletview.h
	src/rpcblockchain.cpp
	src/rpcdump.cpp
	src/rpcmisc.cpp
	src/rpcnet.cpp
	src/rpcprotocol.cpp
	src/rpcrawtransaction.cpp
	src/rpcserver.cpp
	src/rpcwallet.cpp
	src/stamp-h1
	src/test/DoS_tests.cpp
	src/test/Makefile
	src/test/Makefile.am
	src/test/Makefile.in
	src/test/README.md
	src/test/getarg_tests.cpp
	src/test/netbase_tests.cpp
	src/util.cpp
	src/util.h
	src/wallet.cpp
	src/walletdb.cpp