added heartbeat timeout and page reload
Merge remote-tracking branch 'origin/zeromq' into zeromq

Conflicts:
	jsdev/bitex/app/blinktrade.js
heartbeat timeout and page reload