j
Merge branch 'master' into milos
Movie class in model