Revert "Revert "Added happiness to face detection""

This reverts commit 8d8f2aedaf166e3dd6286844f5ec36f913c73e81.