Merge branch 'develop'
Merge branch 'master' into develop
qr
start QRCode implementation method