Merge branch 'master' into develop
-change qrcode

-change qrcode
Merge branch 'develop'