Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts: index.html
Fixed after merge with gh-pages
Added npmjs.com line
Added srcset attribute support
Merge remote-tracking branch 'origin/master' into gh-pages