change Voxels JS interface to be more clear
more particle work
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
added lifetime to particles
implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash
first cut at having particle JS api return ParticleID types
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
add ParticleID class
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
move creatorTokenID management into Particle static members
Merge branch 'master' of https://github.com/worklist/hifi
first cut at using partial property info in particle edits
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Conflicts:
	libraries/shared/src/PacketHeaders.cpp
particle edit checkpoint
Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface

Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/particles/src/ParticleTreeElement.cpp
Merge branch 'master' of https://github.com/worklist/hifi
implemented support for PACKET_TYPE_PARTICLE_ERASE
remove debug code
remove usage of ParticleEditHandle from application