rights channel
fix conflict
prtn rights
Merge branch 'master' of github.com:fresh-design/air
partner rights add video
Merge branch 'master' of github.com:fresh-design/air