added user and video model
Merge branch 'martina'