heroku doesn't like websocket as client or does it, back to xhr
Merge branch 'openshift'