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
Recreated an acceptable app_settings.yml_template after history rewrite (yes there was something you are not supposed to see ;) )
Merge branch 'master' of github.com:artcom/gom-gnp-websocket-bridge
Merge branch 'master' of github.com:artcom/gom-gnp-websocket-bridge