Update to popcorn 1.5.1 for issue #1217
Tentative fix for flash fallback on firefox for popcorn
Fix flash fallback in new embedder, as part of issue #1217
Fix for dimensions of HTML5 videos in the new embedder
Add flv videos to what flowplayer can play in popcorn
Better pattern to find the angular library for our tests

The old one would fail whenever we upgraded angular.
Added service to backup subtitle data (#1138)

Added JSON support to the subtitle editor code.
Added UI for auto-backup (#1138)
Merge branch 'staging' into gh-1171
Enable controls in flowplayer
Updating flowplayer to latest version
Fix for issue #1208 when HTML5 video is open in 2 tabs on Chrome
Merge pull request #1245 from pculture/gh-1171

Gh 1171
Fixed media path in settings
Added redirect check to the token_login() function (#1253)
Added comment to make_redirect_to()
Fix clickjacking vulnerability for issue #1254
removed unused view
Merge pull request #1258 from pculture/gh-1138

Gh 1138 - All seems finr to me
Merge branch 'staging' into gh-1208