Upload to the official repository
	new file:   contrib/gitian-descriptors/README.md
	new file:   contrib/gitian-descriptors/boost-linux.yml
	new file:   contrib/gitian-descriptors/boost-win.yml
	new file:   contrib/gitian-descriptors/deps-linux.yml
	new file:   contrib/gitian-descriptors/deps-win.yml
	new file:   contrib/gitian-descriptors/gitian-linux.yml
	new file:   contrib/gitian-descriptors/gitian-osx-bitcoin.yml
	new file:   contrib/gitian-descriptors/gitian-osx-depends.yml
	new file:   contrib/gitian-descriptors/gitian-osx-native.yml
	new file:   contrib/gitian-descriptors/gitian-osx-qt.yml
	new file:   contrib/gitian-descriptors/gitian-win.yml
	new file:   contrib/gitian-descriptors/protobuf-win.yml
	new file:   contrib/gitian-descriptors/qt-linux.yml
	new file:   contrib/gitian-descriptors/qt-win.yml
	new file:   deuscoin-qt.pro
	modified:   src/bitcoind.cpp
	modified:   src/bitcoinrpc.cpp
	modified:   src/chainparams.cpp
	modified:   src/init.cpp
	modified:   src/main.cpp
	modified:   src/makefile.linux-mingw
	modified:   src/makefile.mingw
	modified:   src/makefile.osx
	modified:   src/makefile.unix
	modified:   src/net.cpp
	modified:   src/noui.cpp
	modified:   src/qt/aboutdialog.cpp
	modified:   src/qt/addressbookpage.cpp
	modified:   src/qt/askpassphrasedialog.cpp
	modified:   src/qt/bitcoin.cpp
	modified:   src/qt/bitcoingui.cpp
	modified:   src/qt/bitcoinstrings.cpp
	modified:   src/qt/bitcoinunits.cpp
	modified:   src/qt/editaddressdialog.cpp
	modified:   src/qt/forms/aboutdialog.ui
	modified:   src/qt/forms/addressbookpage.ui
	modified:   src/qt/forms/intro.ui
	modified:   src/qt/forms/optionsdialog.ui
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/forms/rpcconsole.ui
	modified:   src/qt/forms/signverifymessagedialog.ui
	modified:   src/qt/guiutil.cpp
	modified:   src/qt/intro.cpp
	modified:   src/qt/locale/bitcoin_af_ZA.ts
	modified:   src/qt/locale/bitcoin_ar.ts
	modified:   src/qt/locale/bitcoin_bg.ts
	modified:   src/qt/locale/bitcoin_bs.ts
	modified:   src/qt/locale/bitcoin_ca.ts
	modified:   src/qt/locale/bitcoin_ca_ES.ts
	modified:   src/qt/locale/bitcoin_cs.ts
	modified:   src/qt/locale/bitcoin_cy.ts
	modified:   src/qt/locale/bitcoin_da.ts
	modified:   src/qt/locale/bitcoin_de.ts
	modified:   src/qt/locale/bitcoin_el_GR.ts
	modified:   src/qt/locale/bitcoin_en.ts
	modified:   src/qt/locale/bitcoin_eo.ts
	modified:   src/qt/locale/bitcoin_es.ts
	modified:   src/qt/locale/bitcoin_es_CL.ts
	modified:   src/qt/locale/bitcoin_et.ts
	modified:   src/qt/locale/bitcoin_eu_ES.ts
	modified:   src/qt/locale/bitcoin_fa.ts
	modified:   src/qt/locale/bitcoin_fa_IR.ts
	modified:   src/qt/locale/bitcoin_fi.ts
	modified:   src/qt/locale/bitcoin_fr.ts
	modified:   src/qt/locale/bitcoin_fr_CA.ts
	modified:   src/qt/locale/bitcoin_gu_IN.ts
	modified:   src/qt/locale/bitcoin_he.ts
	modified:   src/qt/locale/bitcoin_hi_IN.ts
	modified:   src/qt/locale/bitcoin_hr.ts
	modified:   src/qt/locale/bitcoin_hu.ts
	modified:   src/qt/locale/bitcoin_it.ts
	modified:   src/qt/locale/bitcoin_ja.ts
	modified:   src/qt/locale/bitcoin_la.ts
	modified:   src/qt/locale/bitcoin_lt.ts
	modified:   src/qt/locale/bitcoin_lv_LV.ts
	modified:   src/qt/locale/bitcoin_nb.ts
	modified:   src/qt/locale/bitcoin_nl.ts
	modified:   src/qt/locale/bitcoin_pl.ts
	modified:   src/qt/locale/bitcoin_pt_BR.ts
	modified:   src/qt/locale/bitcoin_pt_PT.ts
	modified:   src/qt/locale/bitcoin_ro_RO.ts
	modified:   src/qt/locale/bitcoin_ru.ts
	modified:   src/qt/locale/bitcoin_sk.ts
	modified:   src/qt/locale/bitcoin_sr.ts
	modified:   src/qt/locale/bitcoin_sv.ts
	modified:   src/qt/locale/bitcoin_th_TH.ts
	modified:   src/qt/locale/bitcoin_tr.ts
	modified:   src/qt/locale/bitcoin_uk.ts
	modified:   src/qt/locale/bitcoin_zh_CN.ts
	modified:   src/qt/locale/bitcoin_zh_TW.ts
	modified:   src/qt/optionsdialog.cpp
	modified:   src/qt/paymentserver.cpp
	modified:   src/qt/paymentserver.h
	modified:   src/qt/res/bitcoin-qt.rc
	modified:   src/qt/res/icons/bitcoin.png
	modified:   src/qt/res/icons/bitcoin_testnet.png
	new file:   src/qt/res/icons/deuscoin.ico
	new file:   src/qt/res/icons/deuscoin_testnet.ico
	modified:   src/qt/res/icons/toolbar.png
	modified:   src/qt/res/icons/toolbar_testnet.png
	modified:   src/qt/res/images/splash.png
	modified:   src/qt/res/images/splash_testnet.png
	modified:   src/qt/rpcconsole.cpp
	modified:   src/qt/sendcoinsentry.cpp
	modified:   src/qt/signverifymessagedialog.cpp
	modified:   src/qt/splashscreen.cpp
	modified:   src/rpcdump.cpp
	modified:   src/rpcmining.cpp
	modified:   src/rpcrawtransaction.cpp
	modified:   src/rpcwallet.cpp
	modified:   src/util.cpp
	modified:   src/version.cpp
	deleted:    contrib/gitian-descriptors/README
	deleted:    contrib/gitian-descriptors/boost-win32.yml
	deleted:    contrib/gitian-descriptors/deps-win32.yml
	deleted:    contrib/gitian-descriptors/gitian-win32.yml
	deleted:    contrib/gitian-descriptors/gitian.yml
	deleted:    contrib/gitian-descriptors/qt-win32.yml
	deleted:    neoscoin-qt.pro
	deleted:    src/qt/res/icons/neoscoin.ico
	deleted:    src/qt/res/icons/neoscoin_testnet.ico
Merge branch 'master' of https://github.com/deuscoin/deuscoin

Conflicts:
	README.md

	new file:   LICENSE
	modified:   README.md
	deleted:    contrib/gitian-descriptors/README
	deleted:    contrib/gitian-descriptors/boost-win32.yml
	deleted:    contrib/gitian-descriptors/deps-win32.yml
	deleted:    contrib/gitian-descriptors/gitian-win32.yml
	deleted:    contrib/gitian-descriptors/gitian.yml
	deleted:    contrib/gitian-descriptors/qt-win32.yml
	deleted:    neoscoin-qt.pro
	deleted:    src/qt/res/icons/neoscoin.ico
	deleted:    src/qt/res/icons/neoscoin_testnet.ico