Control Panel: resource library popup's preview image size bugfix.
Storefront:  default_html5 template minor bug fixes. t-xv
Merge remote-tracking branch 'origin/1.1.5' into 1.1.5