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

Conflicts:
	CameraTestFinal/AndroidManifest.xml
	CameraTestFinal/bin/R.txt
	CameraTestFinal/bin/classes/com/marakana/CameraActivity$RemindTask.class
	CameraTestFinal/bin/classes/com/marakana/Preview$1.class
	CameraTestFinal/bin/classes/com/marakana/Preview.class
	CameraTestFinal/src/com/marakana/CameraActivity.java
	CameraTestFinal/src/com/marakana/Preview.java
	CaptureActivity/bin/AndroidManifest.xml
	MainLayout/bin/classes/com/datumdroid/android/ocr/simple/R$drawable.class
	MainLayout/bin/classes/com/datumdroid/android/ocr/simple/R$id.class
	MainLayout/bin/classes/com/datumdroid/android/ocr/simple/R$layout.class
	MainLayout/bin/classes/com/datumdroid/android/ocr/simple/R$string.class
	MainLayout/bin/classes/com/datumdroid/android/ocr/simple/R.class
	MainLayout/bin/dexedLibs/annotations-d06bff87efc6e8afc04d458ccaaf83a0.jar
	MainLayout/bin/dexedLibs/simple-android-ocr-own-445db7d1274366b22a137410e3f3173d.jar
	MainLayout/bin/dexedLibs/tess-two-6682c2d3c4b5520a4c7d11cc15abbb3b.jar
	MainLayout/gen/com/datumdroid/android/ocr/simple/R.java
	Simple-Android-OCR-Own/SimpleAndroidOCRActivity3.java
	Simple-Android-OCR/.classpath
	Simple-Android-OCR/project.properties
	tess-two/bin/tess-two.jar
i