test updates for some editor changes
Tentative for issue #1223, to use  instead of ng-bind-html-unsafe
Another binding fix for issue #1223
Fixed linebreaks on the player (#1124)
Removed caption_display_mode hack.

This was netflix-specific and we're not using it anymore.
adding trust to the other to shortcuts and changing the text on the third
Merge pull request #1226 from pculture/gh-1223

Gh 1223
Merge pull request #1225 from pculture/gh-1124

Gh 1124
Merge branch 'staging' into production