don’t render toy ball if hand controller trigger not pressed at all
merge fix
Merge branch 'master' of https://github.com/worklist/hifi
merge fix
Merge pull request #1365 from ZappoMan/particle_voxel_collisions

Particle voxel collisions
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1366 from ZappoMan/particle_voxel_collisions

particle to particle collisions
Merge branch 'master' of https://github.com/worklist/hifi
add menu option for sixense filter
Fix for crash that Philip was seeing.
Merge pull request #1370 from ey6es/master

Fix for crash that Philip was seeing.
Merge pull request #1369 from ZappoMan/particle_voxel_collisions

New Particle Features
Merge fixes
Grab and move with button 4
Merge pull request #1372 from PhilipRosedale/grabStepping

Grab and move yourself around with button 4
Adding build sequence to Interface build
Tidy up
Merge pull request #1375 from murillodigital/master

Including and printing Jenkins build job number
Printing build version on title
Typo fix