Merge "Changes in Particle System for NUI" into devel/master