x
resolve conflict
add more genre, language
add ca nhac to exception list
Merge branch 'develop' of http://10.3.9.238/qa/new-ruby into develop
Merge branch 'develop' of 10.3.9.238:qa/new-ruby into develop
sort by start_date
film:action - film:us
Merge branch 'develop' of 10.3.9.238:qa/new-ruby into develop