Hybridization step 1 - combined dfgui and ngui to make working text box.
Merge branch 'master' of https://github.com/SlabtownJake/Primetime

Conflicts:
	.gitignore
	Assets/Builtin skin/Skin.guiskin.meta
	Assets/Builtin skin/Sources/UnityAtlas.mat.meta
	Assets/Builtin skin/Sources/UnityAtlas.prefab.meta
	Assets/Camera.prefab.meta
	Assets/Control - Simple Text Box.prefab.meta
	Assets/Daikon Forge/DFGUI/Editor.meta
	Assets/Daikon Forge/DFGUI/Editor/dfAnimationClipInspector.cs.meta
	Assets/Daikon Forge/DFGUI/Editor/dfButtonInspector.cs.meta
	Assets/Daikon Forge/DFGUI/Editor/dfCheckboxInspector.cs.meta
	Assets/Daikon Forge/DFGUI/Editor/dfControlInspector.cs.meta
	Assets/Daikon Forge/DataBinding/Editor.meta
	Assets/Daikon Forge/Examples/ActionBar/Prefabs.meta
	Assets/Daikon Forge/Examples/ActionBar/Prefabs/Spell Inventory Prefab.prefab.meta
	Assets/Daikon Forge/Examples/Adding and Removing Controls Dynamically/Adding and Removing Controls.unity.meta
	Assets/Daikon Forge/Examples/Color Picker/ColorPickerTest.unity.meta
	Assets/Daikon Forge/Examples/Containers/AutoArrange.unity.meta
	Assets/Draggable.prefab.meta
	Assets/ImmediateWindow/Editor.meta
	Assets/ImmediateWindow/Editor/NGCompiler.cs.meta
	Assets/ImmediateWindow/Example Scene/Resources/TestMaterial 1.mat.meta
	Assets/ImmediateWindow/Example Scene/Resources/TestMaterial 2.mat.meta
	Assets/NguiChild.cs.meta
	Assets/PTA0001.unity.meta
	Assets/PTAGUI.meta
	Assets/PTAGUI/Settings/Network/SettingsMinimized.cs.meta
	Assets/PTAGUI/Settings/SettingsWindow.cs
	Assets/PTAGUI/Settings/SettingsWindow.cs.meta
	Assets/PTAGUI/Settings/SettingsWindow.prefab
	Assets/PTAGUI/Settings/SettingsWindow.prefab.meta
	Assets/STGUI.meta
	Assets/STGUI/Editor.meta
	Assets/STGUI/Editor/dfTextareaInspector.cs
	Assets/STGUI/Editor/dfTextareaInspector.cs.meta
	Assets/STGUI/Prefabs.meta
	Assets/STGUI/Upgrades/dfTextarea.cs
	Assets/STGUI/Upgrades/dfTextarea.cs.meta
	Assets/STNGUI/DataLinkers/DictStringTextbox.cs.meta
	Assets/STNGUI/Prefabs.meta
	Assets/Scripts.meta
	Assets/Scripts/DataManager.cs
	Assets/Scripts/DataManager.cs.meta
	Assets/Scripts/STDict.cs
	Assets/Scripts/STDict.cs.meta
	Assets/Scripts/STDictString.cs
	Assets/Scripts/STDictString.cs.meta
	Assets/Spider Toolkit/Examples.meta
	Assets/Spider Toolkit/Resources/Art/Button.png
	Assets/Spider Toolkit/Resources/Art/Button.png.meta
	Assets/Spider Toolkit/Resources/Art/fireball.png.meta
	Assets/Spider Toolkit/Resources/Art/ship.png.meta
	Assets/Spider Toolkit/Resources/Art/shipbig.png.meta
	Assets/Spider Toolkit/Resources/Particles/Smoker.mat
	Assets/Spider Toolkit/Resources/Particles/licence.txt.meta
	Assets/Spider Toolkit/Resources/Particles/smalljunk01.png
	Assets/Spider Toolkit/Resources/Particles/smalljunk02.png
	Assets/Spider Toolkit/st Main/Behaviors/MouseCursorHide.cs.meta
	Assets/Spider Toolkit/st Main/Behaviors/SceneTimer.cs.meta
	Assets/Spider Toolkit/st Object/Input.meta
	Assets/Spider Toolkit/st Tools/Editor.meta
	Assets/Spider Toolkit/st Tools/EmptyScene.unity.meta
	Assets/crossbreed.unity.meta
	Assets/hybridgui.unity.meta
	Assets/nettest.unity
	Assets/nguitest.unity.meta
	Assets/tabwindow.unity.meta
	Assets/teste.cs.meta