Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	plugin.xml

plugin.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:rim="http://www.blackberry.com/ns/widgets"
-    id="phonegap-plugin-barcodescanner"
-    version="5.0.0">
     id="com.phonegap.plugins.barcodescanner"
-    version="4.2.0">
+    version="5.0.0">
 
     <name>BarcodeScanner</name>
     <description>You can use the BarcodeScanner plugin to scan different types of barcodes (using the device's camera) and get the metadata encoded in them for processing within your application.</description>