barcode scan tablet ok
edf
Merge branch 'master' of http://github.com/Rikdl/iFridge

Conflicts:
	CaptureActivity/bin/captureactivity.jar
	api/bin/dexedLibs/android-support-v4-6183e413d68dbee938cdc78a1a112033.jar
	iFridgeTablet/.classpath
	iFridgeTablet/bin/classes.dex
	iFridgeTablet/bin/dexedLibs/Parse-1.2.0-3c4c3128baa29fba569053bf084a086f.jar
	iFridgeTablet/bin/dexedLibs/captureactivity-84fe4f2ef876743a51d9de7176371e63.jar
	iFridgeTablet/bin/dexedLibs/core-43368ce2fd90edb4f017c8434d51c149.jar
	iFridgeTablet/bin/dexedLibs/core-e0b93eac18c5c528e3ac2f41332cb7b8.jar
	iFridgeTablet/bin/resources.ap_