added new market screen
Merge remote-tracking branch 'origin/zeromq' into zeromq

Conflicts:
	jsdev/build_release.sh