commit before pull
Merge branch 'master' of https://github.com/Rolom/medusa

Conflicts:
	JellyFish/Assets/Icons.meta
	JellyFish/Assets/Resources/PlactomDieParticle.prefab
	JellyFish/Assets/Resources/Scenario02.prefab
	JellyFish/Assets/Scenes/Stage_randomScenario.unity
	JellyFish/JellyFish.userprefs
Changed to Abstract class sound manage.
Remove the lose of lifes when a plankton is missing