merged master

This pull request is for alembic migration script to remove 'channel_video'.