My QR code button
QR code scanner button
Merge remote-tracking branch 'origin/dev' into dev