Nicely deal with case where a video is on amara but does not have subtitles yet
Merge branch 'staging' into gh-1219
Better behavior of drop-up menu when video is not on amara
Merge pull request #1527 from pculture/gh-1219

Gh 1219
Update ondemand URL
Merge pull request #1536 from pculture/gh-1530

Update ondemand URL
Fix conflict in embedder JavaScript