refonte sort
Merge branch 'master' of https://github.com/schobbent/DeviliciousProto

Conflicts:
	Assets/Bernard/Scripts/Gameplay/Spells/Spell.cs
	Assets/Bernard/Scripts/Gameplay/Spells/Thunder.cs
	Assets/New Terrain.asset
	Assets/Shocoben/Prefabs/Spells/ThunderSpell.prefab