Added hair
Merge branch 'hairfeature'