Revert "deleted files"

This reverts commit 224bb9de2d6ff87bda3f14b79e09fd049790f43a.
changes from test1 laptop
changes from opening up unity in master
opened up to unity once pc
added tk3d again onpcin masterbranch
Merge remote-tracking branch 'origin/master' into testxmlloader-problem

Conflicts:
	xmldataloader/Assembly-CSharp.pidb
	xmldataloader/Assembly-UnityScript-vs.unityproj
	xmldataloader/Assembly-UnityScript.pidb
	xmldataloader/Assembly-UnityScript.unityproj
	xmldataloader/Assets/-tk2d.asset
	xmldataloader/Assets/-tk2d.asset.meta
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/Font/OldSansBlack/UIDemoOldSansBlack data.prefab
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDemoSpriteCollection Data/UIDemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDemoSpriteCollection Data/atlas0.png
	xmldataloader/Assets/TK2DROOT/tk2dUI_demo/Assets/SpriteCollection/UIDemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/democameradata/DemoCameraSpriteCollection_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/DemoSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteCollection_Data/data.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/DemoSpiderSpriteCollection.prefab
	xmldataloader/Assets/TK2DROOT/tk2d_demo/spider/Spider_Data/data.prefab
	xmldataloader/Assets/XmlDataLoader.unity
	xmldataloader/Library/AssetServerCacheV3
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	xmldataloader/Library/ScriptAssemblies/Assembly-UnityScript.dll
	xmldataloader/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	xmldataloader/Library/ScriptMapper
	xmldataloader/Library/assetDatabase3
	xmldataloader/Library/expandedItems
	xmldataloader/Library/guidmapper
	xmldataloader/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	xmldataloader/Library/metadata/b6/b621aad4794cc4735a5d5a89aad44460