Cinema extends Channel & CinemaSet extends ChannelSet
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/Caro'