Updated files from my computer.
Face stuff implemented, not yet tested.
Merge commit
Merge branch 'ocvTests'

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi