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

Conflicts:
	CaptureActivity/bin/captureactivity.jar