added qr code scanner support
solve conflicts
Merge pull request #418 from colkito/feature/qr-reader

412 New feature: qr code scanner
fix conflict