bitex listview and merchant transaction list
Merge branch 'zeromq' of github.com:pinhopro/bitex into zeromq

Conflicts:
	jsdev/bitex/app/merchant.js