add return to video page button on questions page
Merge remote-tracking branch 'origin/master'