Merge pull request #2176 from ey6es/master

Don't simulate avatars when they're being rendered as billboards, fix QThreadStorage warning.
Merge branch 'master' of https://github.com/highfidelity/hifi