Fixed bad merges
Merge branch 'perlin_face' of https://github.com/Atlante45/hifi into perlin_face