fixed emails and model
Merge branch 'zeromq' of github.com:pinhopro/bitex into zeromq

Conflicts:
	apps/trade/models.py
Merge branch 'zeromq' of github.com:pinhopro/bitex into zeromq