User model updated
Fixed master merge conflict
Merged upstream files and fixed conflict
Question progress bar updated
Completed video questions functionality
Merge remote-tracking branch 'upstream/master'