Loop on startup until embed is ready to occur
161: Fixed a few more compilation issues on the Wistia player
remove debug screenshot
Merge branch 'dev' of github.com:pculture/unisubs into dev
Fixing upstream merge
Fixed chrome/controls not appearing on display page
Implementing setPlayheadTime fixes seek not working
Merge pull request #86 from Pencilneck/dev

161: Wistia support for non dialog player
Updated transifex translations -- through update_translations.sh
adding some tests for display of moderated videos on Videos page.
Merge pull request #87 from jdragojevic/wd-moderation

adding some tests for display of moderated videos on Videos page.
12298: Prevent duplicate users with gmail openid.

I'm not sure why this is happening, but we can work around it by using
the email to lookup the UserProfile object instead of the openid key.
12298: log error when we apply our gmail OpenID hack

Hopefully this will give us enough info to understand the issue better
and maybe make a better fix.
Merge pull request #89 from bendk/gmailopenid

12298: Gmailopenid
Merge branch 'staging' into dev