feature #2589: Add support for multiple files and templates to the Import dialog of the Marketplace
feature #2589: Show Image and Template ID when a new resource is created
Merge branch 'feature-2589' of git.opennebula.org:one into feature-2589