Allen first (interface_of_qrcode)
Merge remote-tracking branch 'origin/master'