added valid btc address
Merge remote-tracking branch 'origin/zeromq' into zeromq
Merge branch 'zeromq' of github.com:pinhopro/bitex into zeromq
removed wrong diff
Merge remote-tracking branch 'origin/zeromq' into zeromq

Conflicts:
	apps/trade/models.py