Other World TEST
Merge branch 'master' of github.com:Beunn/SixLegends

Conflicts:
	2.Sourcecode/2.Sourcecode-csharp.suo
	2.Sourcecode/Library/InspectorExpandedItems.asset