Bugfix
Bugfix
Merge branch 'char'

Conflicts:
	Build/TestBuild.app/Contents/Data/Managed/Assembly-UnityScript-firstpass.dll
	Build/TestBuild.app/Contents/Data/PlayerConnectionConfigFile
	Build/TestBuild_01.app/Contents/Data/Managed/Assembly-CSharp-firstpass.dll
	Build/TestBuild_01.app/Contents/Data/Managed/Assembly-UnityScript.dll
	Build/TestBuild_01.app/Contents/Data/mainData
	Build/TestBuild_01.app/Contents/Data/sharedassets0.assets
	Build/TestBuild_01.app/Contents/MacOS/Test
	Project/Assembly-CSharp-firstpass-vs.csproj
	Project/Assembly-CSharp-firstpass.csproj
	Project/Assets/Scenes/Leveldesign_Benny.unity.meta
	Project/Assets/Scenes/Leveldesign_Lukas/NavMesh.asset.meta
	Project/Project-csharp.sln
	Project/Project.sln