Merge branch 'master' of redacted:core/gnp_websocket_proxy

Conflicts:
	public/gnp.js.erb
now publishes the ws url to gom for non-js clients