change
Merge branch 'master' of https://github.com/BenFromLA/HFRcoin

Conflicts:
	COPYING
	INSTALL
	README.md
	contrib/bitrpc/bitrpc.py
	contrib/gitian-descriptors/gitian-win32.yml
	contrib/gitian-descriptors/gitian.yml
	contrib/gitian-downloader/coblee-key.pgp
	contrib/macdeploy/fancy.plist
	contrib/macdeploy/macdeployqtplus
	doc/Doxyfile
	doc/README.md
	doc/README_windows.txt
	doc/Tor.txt
	doc/build-msw.md
	doc/build-osx.md
	doc/build-unix.md
	doc/readme-qt.rst
	doc/release-notes.md
	doc/release-process.md
	doc/unit-tests.md
	share/qt/Info.plist
	share/qt/clean_mac_info_plist.py
	share/setup.nsi
	src/base58.h
	src/bitcoinrpc.cpp
	src/checkpoints.cpp
	src/init.cpp
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/makefile.mingw
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/qt/aboutdialog.cpp
	src/qt/addressbookpage.cpp
	src/qt/askpassphrasedialog.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/bitcoinunits.cpp
	src/qt/editaddressdialog.cpp
	src/qt/forms/aboutdialog.ui
	src/qt/forms/addressbookpage.ui
	src/qt/forms/optionsdialog.ui
	src/qt/forms/overviewpage.ui
	src/qt/forms/rpcconsole.ui
	src/qt/forms/sendcoinsdialog.ui
	src/qt/forms/signverifymessagedialog.ui
	src/qt/guiutil.cpp
	src/qt/locale/bitcoin_af_ZA.ts
	src/qt/locale/bitcoin_ar.ts
	src/qt/locale/bitcoin_bg.ts
	src/qt/locale/bitcoin_bs.ts
	src/qt/locale/bitcoin_ca.ts
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_cy.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_el_GR.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_eo.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_gu_IN.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hi_IN.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_ja.ts
	src/qt/locale/bitcoin_la.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_lv_LV.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_pt_PT.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_th_TH.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/optionsdialog.cpp
	src/qt/paymentserver.cpp
	src/qt/qrcodedialog.cpp
	src/qt/res/bitcoin-qt.rc
	src/qt/rpcconsole.cpp
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsentry.cpp
	src/qt/signverifymessagedialog.cpp
	src/qt/splashscreen.cpp
	src/qt/test/uritests.cpp
	src/rpcdump.cpp
	src/rpcmining.cpp
	src/rpcrawtransaction.cpp
	src/rpcwallet.cpp
	src/test/test_bitcoin.cpp
	src/test/transaction_tests.cpp
	src/util.cpp