Barcodescanner
Barcodescanner
Barcodescanner
fix merge
Merge branch 'master' of https://github.com/almalence/OpenCamera.git

Conflicts:
	src/com/almalence/opencam/PluginManager.java