3.5

This pull request fixes the new modal on 3.5. Now it works, I think it still needs a little work (the button for adding a new image doesn't disappear when you have your image selected, and the css for the image could be better), but the basic (upload, select, use) works with the new modal.

Un saludo.