uniform validation on merchant app
Merge branch 'zeromq' of github.com:pinhopro/bitex into zeromq

Conflicts:
	jsdev/bitex/app/blinktrade.js