Got adding and deleting images for checkins working
Fixing merge conflict with app.js and app.js.map