Added happiness to face detection
Revert "Added happiness to face detection"

This reverts commit 6d5974778947675e9cd741caced0adf189a6f421.
Revert "Revert "Added happiness to face detection""

This reverts commit 8d8f2aedaf166e3dd6286844f5ec36f913c73e81.
Fixes