Bug fixes for viewer and soundcloud
Merge branch 'master' into gh-pages