Added methods for setting deactivation and gravity to pso
Merged pso