remove options for admins in movies table confilct resolved
Merge branch 'master' of github.com:aydao/Cinema