[IMP] website: image controller can use xmlid
Merge pull request #2153 from odoo-dev/master-website-image-controller-chm

[IMP] website: image controller can use xmlid
Merge branch 'master' of https://github.com/odoo/odoo into master-win32