merged master

This pull request contains alembic migration script to remove 'channel_video'.