Added facedetect and modified Makefile
XMerge branch 'master' of https://github.com/kartiktwr/ADE

Conflicts:
	build/Makefile