Bug 899526 - [Gallery][HD] Thumbnails are blurred

Merge from master branch aef00e0abb974a05f5aea139a299be5ec473be92,
and solve some conflict in MetadataParser.js and gallery.css.