Commit
Merge branch 'devyb' of https://github.com/dx11/ybcoin into devyb

Conflicts:
	src/coincontrol.h
	src/qt/coincontroldialog.cpp
	src/qt/coincontroldialog.h
	src/qt/coincontroltreewidget.cpp
	src/qt/coincontroltreewidget.h
	src/qt/forms/coincontroldialog.ui