Merge branch 'Ning'

Conflicts:
	GameAssets/Art/2D/README.txt
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Background/Background
Scripts/GameBackground.prefab.meta
	Unity Project/Assets/Background/Background
Scripts/SplashBackground.prefab
	Unity Project/Assets/Background/SplashScreen2.png.meta
	Unity Project/Assets/Background/orange-background.png.meta
	Unity Project/Assets/Characters/GameObjects.meta
	Unity Project/Assets/Characters/GameObjects/Character2.prefab.meta~HEAD
	Unity Project/Assets/Characters/GameObjects/Character3.prefab
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~Ning
	Unity Project/Assets/Characters/GameObjects/Character4.prefab.meta
	Unity Project/Assets/Characters/GameObjects/Character5.prefab
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta~HEAD
	Unity Project/Assets/Characters/PlayerScripts/Character.cs
	Unity Project/Assets/Characters/PlayerScripts/Character.cs.meta
	Unity Project/Assets/GUI/App Icon/AppIcon2.png.meta
	Unity Project/Assets/GUI/GUI Scripts/CharacterSelectUI.cs.meta
	Unity Project/Assets/GUI/Textures.meta
	Unity Project/Assets/GUI/Textures/button.png.meta
	Unity Project/Assets/GameController/GameController
Scripts/characterSelectController.cs
	Unity Project/Assets/GameController/GameController
Scripts/wordBuildingController.cs
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.mat.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Header.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Normal.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/SciFi.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Wooden.meta
	Unity Project/Assets/Scenes/CharacterSelect.unity
	Unity Project/Assets/Scenes/Test Scenes.meta
	Unity Project/Assets/Scenes/Test Scenes.meta~HEAD
	Unity Project/Assets/Scenes/Test Scenes.meta~Ning
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD
	Unity Project/Assets/WordList/sowpods.txt.meta~Ning
	Unity Project/Assets/letterGenScript/LetterController.cs
	Unity Project/Assets/letterGenScript/debugLetters.cs.meta
	Unity Project/Assets/letterGenScript/letters/letterA.prefab
	Unity Project/Assets/letterGenScript/letters/letterB.prefab
	Unity Project/Assets/letterGenScript/letters/letterD.prefab
	Unity Project/ProjectSettings/ProjectSettings.asset
	Unity Project/ProjectSettings/TagManager.asset
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln
deleted NGUI package

Conflicts:
	GameAssets/Art/2D/README.txt
	Unity Project/Assembly-CSharp-vs.csproj
	Unity Project/Assembly-CSharp.csproj
	Unity Project/Assets/Background/Background
Scripts/SplashBackground.prefab
	Unity Project/Assets/Background/Background
Scripts/StartBackground.prefab.meta
	Unity Project/Assets/Background/SplashScreen2.png.meta
	Unity Project/Assets/Background/orange-background.png.meta
	Unity Project/Assets/Background/orange-background.png.meta~Ning_0
	Unity Project/Assets/Characters/GameObjects.meta
	Unity Project/Assets/Characters/GameObjects/Character3.prefab
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character3.prefab~Ning
	Unity Project/Assets/Characters/GameObjects/Character4.prefab
	Unity Project/Assets/Characters/GameObjects/Character4.prefab.meta
	Unity Project/Assets/Characters/GameObjects/Character5.prefab
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~HEAD
	Unity Project/Assets/Characters/GameObjects/Character5.prefab~Ning
	Unity Project/Assets/Characters/GameObjects/CharacterAssets.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta~Ning
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character1.control
ler.meta~Ning_0
	Unity
Project/Assets/Characters/GameObjects/CharacterAssets/Character2.control
ler.meta
	Unity Project/Assets/Characters/PlayerScripts/Character.cs
	Unity Project/Assets/Characters/PlayerScripts/TasteCollection.cs.meta
	Unity Project/Assets/GUI/App Icon/AppIcon2.png.meta
	Unity Project/Assets/GUI/GUI Scripts/CharacterSelectUI.cs.meta
	Unity Project/Assets/GUI/Textures/button.png.meta
	Unity Project/Assets/GameController/GameController
Scripts/characterSelectController.cs
	Unity Project/Assets/GameController/GameController
Scripts/wordBuildingController.cs
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Atlas
- Masks.psd.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.mat.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive
Atlas.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Header.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Refractive/Refractive Font
- Normal.prefab.meta
	Unity Project/Assets/NGUI/Examples/Atlases/SciFi.meta
	Unity Project/Assets/NGUI/Examples/Atlases/Wooden.meta
	Unity Project/Assets/Scenes/CharacterSelect.unity
	Unity Project/Assets/Scenes/Test Scenes.meta
	Unity Project/Assets/Scenes/Test Scenes.meta~Ning
	Unity Project/Assets/Scenes/Test Scenes.meta~Ning_0
	Unity Project/Assets/Scenes/WordMaking.unity
	Unity Project/Assets/WordList.meta
	Unity Project/Assets/WordList/sowpods.txt.meta
	Unity Project/Assets/WordList/sowpods.txt.meta~HEAD
	Unity Project/Assets/WordList/sowpods.txt.meta~Ning
	Unity Project/Assets/WordList/sowpods.txt.meta~Ning_0
	Unity Project/Assets/letterGenScript/LetterController.cs
	Unity Project/Assets/letterGenScript/debugLetters.cs.meta
	Unity Project/Assets/letterGenScript/letters/letterA.prefab
	Unity Project/Assets/letterGenScript/letters/letterB.prefab
	Unity Project/Assets/letterGenScript/letters/letterC.prefab
	Unity Project/Assets/letterGenScript/letters/letterD.prefab
	Unity Project/ProjectSettings/ProjectSettings.asset
	Unity Project/ProjectSettings/TagManager.asset
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln