Cleanup
Merge branch 'master' into movies-why-view-id-doesnt-work
Resolve movie/view/id
Resolve state resolve