Fix bug 732085: Update es-Noir promo.
Hook videos and UserProfiles to cache.

fix bug 735498
Remove zh-CN and sl, add it and ru.
Remove broken locales.
Add back ja and zh-TW locales.
Re-added zh-CN locale. Bug 736525.
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Changes how viewcounts are persisted.

Changes viewcounts to be saved to the DB every view until 100 views,
and then every 10 views after that. Also adds a cron management
command that loops through all current videos and saves them to
the DB if they have a viewcount stored in the DB.

fix bug 740638
Fix bug with cache not invalidating on view update.
Invalidate VIEWS_KEY when videos are saved.
Update ES twilight subtitles to newest version.

fix bug 732085
Merge branch 'refs/heads/develop'

Conflicts:
	flicks/settings/test.py
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
video_item macro requires context when importing.

fix bug 756244