Fix merge conflict in OperaBlink/manifest.json
Fix indentation of new styles
Add quotes around attributes in upload module
Replace innerHTML with safeHtml