little problem solved
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rayman/jupiter_sprite_manage.cpp

merage conflicts solved