Adding AABox::touches(box)
Adding ParticleTreeElement::findParticles(box, QVector<Particles*>)
Adding ParticleTreeElement::findParticles(box, QVector<Particles*>)
Adding ParticleTree::findParticles(box, QVector<Particle*>) method
Moving applyHardCollision to the Particle class.  Adding daming and elasticity to CollisionInfo.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
more efficient ParticleTree::getParticles() and adding ParticleTree::getParticlesForUpdate()
implement local edits in ParticleScriptingInterface
first part of getting local particle tree in agent
tweaks to editParticle example
more work on allowing for local particle trees
Don't add the specular alpha in the model fragment shaders.
Fix for AABox::touches(otherBox)
Fix issue #1684 : particles collide against avatars again.

This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
first cut at particle meshes
Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes
packet header changes and beginning of conversion to QByteArray
cleanup some UUID packing
Merge branch 'master' of https://github.com/highfidelity/hifi