Main character change

MC2.0, in prefabs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Assembly-CSharp-vs.csproj
	Project3/Assembly-CSharp.csproj
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/CurrentMaximizeLayout.dwlt
	Project3/Library/InspectorExpandedItems.asset
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	Project3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/expandedItems
	Project3/Library/guidmapper
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs