Add uploading and cropping of images to app.js
Fix erroneous merge conflicts.