added System.Collections.Generic to incudes
Merge remote-tracking branch 'origin/Flavors-as-List'