Temporarily removed video from JSON + added hint count if context == addhints
Merge branch 'dev'