Trading

Conflicts:
	src/qt/bitcoingui.cpp