Merge branch 'master' into pre-v0.23

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -253,6 +253,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
                 String prompt = getResources().getString(R.string.scanCardBarcode);
                 integrator.setPrompt(prompt);
+                integrator.setBeepEnabled(false);
                 integrator.initiateScan();
             }
         };