Merge branch 'dev' into x-new-puppet-setup
Add Action model to admin
Update integration repo
Document ActivityResource
Yet another fix for #1168

For some reason that i still don't know why,
sometimes TeamVideo search index for an instance
gets stale after a delete and that is making the
code on permissions to fail because we can't find
the instance from the search index.

If that happens, always return false on the permissions.
Also, if we a stale index, remove it from solr.
Merge branch 'dev' of github.com:pculture/unisubs into dev
Merge branch 'staging' into dev
Merge branch 'staging' into dev
Fix #973

* Added mapping for missing translations (for example
es_ES on transifex is es for us)
* Changed the script that pulls translations to
pull new translations too
* Pulled manually the new translations and the
ones with new mapping.
Merge branch 'dev' of github.com:pculture/unisubs into dev
Updated transifex translations -- through update_translations.sh
Merge branch 'staging' into dev
Merge pull request #40 from pculture/x-login-trap

Initial implementation of the login trap
Update integration repo.
Some work on the embedder, re: transcript viewer.
Merged staging into dev
Updated integration repo
Updated integration repo
Updated transifex translations -- through update_translations.sh
Updated transifex translations -- through update_translations.sh