Badges award modal
Badge progress bar
Completed badge countdown
Updated UserProgress and video_questions specs
Merge remote-tracking branch 'upstream/master'