Add qrcode, change layout.
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages