no message
Merge branch 'master' of https://github.com/Rolom/medusa

Conflicts:
	JellyFish/Assets/Scenes/Stage_randomScenario.unity
	JellyFish/JellyFish.userprefs
Added bonu on Scenario (bonus variable is configurable on the ScoreManager inspector)