Merge pull request #1154 from sgrenier/next

Fixes issues introduced by previous commit
Particle editor/sample improvements.
Will likely be moving this out of samples and into tools in the near future.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next