17 Commits (feature/qrscanner)