modify particle's emission rate
Merge branch '2.1.4' of github.com:Zentertain/cocos2d-x into 2.1.4

Conflicts:
	cocos2dx/particle_nodes/CCParticleSystem.cpp
fix