fix conflicts
adjusts
Merge pull request #653 from devton/ch_partners

Added partners into channel, now channel owners can add they partners on the channel page