Merge "Encode/Decode genres using CSV" into nyc-dev