Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
add marker spheres at 1 meter away from origin for better avatar size testing
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
new sounds for drumsticks
Merge branch 'master' of https://github.com/worklist/hifi
ok, one more shot at fixing particle-server crash
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
Merge pull request #1661 from ZappoMan/bugfixes

another attempt to fix particle-server crash
Merge branch 'master' of https://github.com/worklist/hifi
set default particle lifetime to 10 seconds, make sure lifetime is always honored