Fixed partTest.cpp

Many function names and parameters have been changed in master.  Fixed
the calls in partTest.cpp that were causing compilation errors after
merging with Master.  partTest.cpp compiles now, but does not run due
to shaders not yet working.
Merging conflicts.

Pulled Particle-Effects-Development to prepare to push.  Merged
conflicts and fixed resulting compilatio errors.