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

Conflicts:
	CaptureActivity/bin/captureactivity.jar
	tess-two/bin/tess-two.jar