Commit of death II
Merge branch 'master' of github.com:Beunn/SixLegends

Conflicts:
	2.Sourcecode/2.Sourcecode-csharp.suo
	2.Sourcecode/Assets/Materials/World Worms/HolyBomb.prefab
	2.Sourcecode/Assets/Scenes/Bomber.unity
	2.Sourcecode/Assets/Scripts/ClientInfo.cs
	2.Sourcecode/Assets/Scripts/World DK/DK_barrelScript.cs
	2.Sourcecode/Library/InspectorExpandedItems.asset
	2.Sourcecode/obj/Debug/Assembly-CSharp.dll
	2.Sourcecode/obj/Debug/Assembly-CSharp.pdb