0425 qrcodeview
Merge branch 'master' into lowlow