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