facedetector changed: form hair to hat
merge conflicts fixed