finish face detect function
Merge branch 'master' of github.com:zhangqippp/Hair
resolve conflicts