Merge pull request #2806 from ey6es/master

Specular map support.
Merge branch 'master' of https://github.com/highfidelity/hifi