Added QR code reading on the device page
Merged in master and fixed conflicts
Merge pull request #11 from dummerbd/qrcode

Qrcode