message
Merge branch 'master' of https://github.com/Rikdl/iFridge

Conflicts:
	CameraTestFinal/.classpath
	CameraTestFinal/bin/AndroidManifest.xml
	CameraTestFinal/project.properties
	Simple-Android-OCR-Own/SimpleAndroidOCRActivity3.java
	Simple-Android-OCR/AndroidManifest.xml
	Simple-Android-OCR/src/com/datumdroid/android/ocr/simple/CameraActivity.java
	iFridgeTablet/.classpath
	iFridgeTablet/gen/com/example/ifridgetablet/R.java
	iFridgeTablet/gen/com/google/zxing/client/android/R.java
geen idee
Stickies
gezever
Merge branch 'master' of https://github.com/Rikdl/iFridge

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/13/d081fc50eca800121bd0a04576723660
	CameraTestFinal/.classpath
	CameraTestFinal/bin/AndroidManifest.xml
	CameraTestFinal/bin/CameraDemo.apk
	CameraTestFinal/bin/classes.dex
	CameraTestFinal/bin/classes/com/marakana/CameraActivity$1.class
	CameraTestFinal/bin/classes/com/marakana/CameraActivity$2.class
	CameraTestFinal/bin/classes/com/marakana/CameraActivity$3.class
	CameraTestFinal/bin/classes/com/marakana/CameraActivity.class
	CameraTestFinal/bin/classes/com/marakana/R$drawable.class
	CameraTestFinal/bin/classes/com/marakana/R$id.class
	CameraTestFinal/bin/classes/com/marakana/R$layout.class
	CameraTestFinal/bin/classes/com/marakana/R$string.class
	CameraTestFinal/bin/jarlist.cache
	CameraTestFinal/bin/resources.ap_
	CameraTestFinal/gen/com/marakana/R.java
	CameraTestFinal/project.properties
	CameraTestFinal/res/layout/main.xml
	CaptureActivity/bin/captureactivity.jar
	Stickies/bin/dexedLibs/android-support-v4-100d7ecf20bb1c99ec1962340d1fa898.jar
	Stickies/bin/jarlist.cache
	iFridgeTab/bin/jarlist.cache
	tess-two/bin/tess-two.jar