update
Merge branch 'zeromq' of https://github.com/pinhopro/bitex into zeromq
update
iPS1="\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[33m\]\w\[\e[0m\]\n\$
Merge branch 'zeromq' of https://github.com/pinhopro/bitex into zeromq

Conflicts:
	jsdev/bitex/app/merchant.js