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()
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
Adding avatars back into ParticleCollisionSystem.

Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
import --> include
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions

Conflicts:
	interface/src/avatar/AvatarManager.cpp
Moving MY_AVATAR_KEY back into AvatarManager.cpp
Adding avatar info back into ParticleCollisionSystem ctor arguments.
Merge pull request #1722 from AndrewMeadows/fix-particle-avatar-collisions

Fix particle avatar collisions
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels