Adds main_image foreign key to channel
Merge branch 'master' into sandbox