merge scanImg/scanner
Merge branch 'master' of https://github.com/ylc1218/Qrapp2