adding more behavior to the particle system
turned off setShowingEmitter
added emitter particle
Merge remote-tracking branch 'upstream/master' into particles
added particle life stages
Merge remote-tracking branch 'upstream/master' into particles
Merge pull request #701 from Ventrella/particles

added life stages to particles for effects to change over time
Merge branch 'master' of https://github.com/worklist/hifi into dev4

Conflicts:
	interface/src/Hand.cpp