Merge branch 'staging' into develop
Solutions for #25 (qrcode)
Solution 1 chosen for QRcode, closes #34
Merge pull request #34 from Agent-H/fix/qrcode

Solutions for #25 (qrcode)
Merge branch 'develop' into staging