Merge pull request #2820 from ey6es/master

Scripting interface for avatar attachments.
Merge branch 'master' of https://github.com/highfidelity/hifi