Merge branch 'master' into Ning
Merge branch 'master' into Ning
Merge branch 'master' into Ning
deleted CharacterSelection scene

this was a test scene
cleaned up work making scene UI
Merge branch 'Ning'

Conflicts:
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
	Unity Project/Unity Project.userprefs