Removed xhr polling
Merge branch 'master' into heroku