joske
Merge branch 'master' of http://github.com/Rikdl/iFridge

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Simple-Android-OCR/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Simple-Android-OCR/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/UserLoginApp/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/UserLoginApp/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/iFridgePhone/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/iFridgePhone/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/iFridgePhone/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/zxingtesting2/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/zxingtesting2/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/337322592.index
	.metadata/.plugins/org.eclipse.jdt.core/3779288060.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	CaptureActivity/bin/captureactivity.jar
Merge branch 'master' of http://github.com/Rikdl/iFridge

Conflicts:
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Simple-Android-OCR/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/iFridgePhone/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/iFridgePhone/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/zxingtesting2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/zxingtesting2/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/5.tree
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/878807495.index