fix for results sort error
fix for play/pause in search results
all naming now consistent with imageFiles, and remoteUrl on update now working.
console logs editing
Merge branch 'master' of https://github.com/PRX/pop-up-archive
needed to add addRemoteImage in callbacks
need to have updateImageUpload method
Merge branch 'add_image_branch'

Conflicts:
	app/assets/javascripts/items/controllers.js
controllers from add_image_branch
Merge branch 'master' of https://github.com/PRX/pop-up-archive

Conflicts:
	app/assets/javascripts/items/controllers.js
inline with add_image_branch
need remoteFromUrl callback
Merge branch 'add_image_branch'

Conflicts:
	app/assets/javascripts/items/controllers.js
find_by_file was looking up by file and returning the first one that had that = thus any repeated file uploads of images were failing
to get rails console to run on heroku
taking out spring gem for now just to be able to get in console
gemfile.lock for spring
heroku run console will work with spring but not heroku rails c
reverting the guard file back to using spring
set storage to nil in case of public collection