Merge branch 'master' into gh-pages
add qrcode
Merge branch 'gh-pages'