Bridge/MovingPlatform fix yay
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/guidmapper
	Project3/Library/metadata/8a/8abb343160b14f74a9272165c6764933
	Project3/Library/metadata/92/92a7e67dfbca0b34a9d3081b349c842b
	Project3/Library/metadata/9a/9ac6d7c285fdeaa498681afbceae7bc1
	Project3/Library/metadata/a0/a05aca77d01b34140907d866ffc58c87
	Project3/Library/metadata/b4/b4f3771578b1cc042a892835af05c176
	Project3/Library/metadata/b7/b72170d9e15c0614795cb625beb381ae
	Project3/Library/metadata/e8/e85c95db84549674e93be0ef2cc29aba
	Project3/Project3-csharp.sln
	Project3/Project3.sln