[finish] manage movie & show
Merge remote-tracking branch 'upstream/master' into up