Merge branch 'master' into development

src/android/com/cocodin/barcodescan/plugin/PluginHelper.java

@@ -25,12 +25,10 @@ public class PluginHelper {
     private static boolean threadStop = true;
     private static ExecutorService executor;
     private static Barcode2DWithSoft mInstance;
-    private static JSONArray Devices = new JSONArray();
+    private static JSONArray Devices = new JSONArray().put("camera").put("c4050");
 
     public static void init(CordovaInterface cordova) {
         Context context = cordova.getActivity();
-        Devices.put("camera");
-        Devices.put("c4050");
         try {
             mInstance = Barcode2DWithSoft.getInstance();
             if (mInstance != null) {