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

Conflicts:
	JellyFish/JellyFish.userprefs
Changed the hierarchy of the sounds