Camera Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/CurrentMaximizeLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/guidmapper
	Project3/Library/metadata/0d/0d63e2f16cef8e64b93b12fd20537cb3
	Project3/Library/metadata/1f/1f7936e8ed12ae74f8e86e66b5c6a2e3
	Project3/Library/metadata/3a/3a7ace0fd3eda6b4a96395025068c938
	Project3/Library/metadata/4e/4ed9e11f8fac9f1439318e8e18ad9cb6
	Project3/Library/metadata/68/689d3233bc4ab57419083f59e123b81c
	Project3/Library/metadata/9a/9ac6d7c285fdeaa498681afbceae7bc1
	Project3/Library/metadata/b4/b4f3771578b1cc042a892835af05c176
	Project3/Library/metadata/b7/b72170d9e15c0614795cb625beb381ae
	Project3/Library/metadata/ba/ba3b2d552f0302045a6e281f249d8cc6
	Project3/Library/metadata/f5/f5766cb715a0bfd44acd4351d949fa24
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs