2
Added migration for new image field
Hopefully fixed travis build
Hopefully fixed upload permissions
Fixed merge conflict