Conflicts solved for merge ParticleEditor to development - Win32.