Adding image url fields
adding video url field, migrations
Fixing merge conflicts