QRCode implemented with ZXing
QRCode implemented with ZXing
resolved conflicts in pull