ADd qrcode scan
Merge master