add project - Grip
not edit
Merge branch 'emma' into Household_002_INT

Conflicts:
	AssitantCam/DMCCam/bin/classes/.gitignore
	FaceDetectorResource/FaceDetectorResource/bin/facedetectorresource.jar
	OpenCV Library - 2.4.5/OpenCV Library - 2.4.5/bin/opencv library - 2.4.5.jar