Merge branch 'develop'
bump version
update genres; tmdb now has separate endpoints for movie and tv genres
bump version