re-render now playing when switching to the tab
Merge branch 'master' into gh-pages