stuff from running unity
Merge remote-tracking branch 'origin/master'

Conflicts:
	dragonstomp/Assembly-CSharp-vs.csproj
	dragonstomp/Library/CurrentLayout.dwlt
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	dragonstomp/Library/assetDatabase3
	dragonstomp/Library/expandedItems
	dragonstomp/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	dragonstomp/Library/shadercompiler-1.log
	dragonstomp/dragonstomp-csharp.sln
	dragonstomp/dragonstomp.sln
more uncommitted stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	dragonstomp/Assembly-CSharp-Editor-vs.csproj
	dragonstomp/Assembly-CSharp-Editor.csproj
	dragonstomp/Assembly-CSharp-vs.csproj
	dragonstomp/Assembly-CSharp.csproj
	dragonstomp/Assets/-tk2d.asset.meta
	dragonstomp/Assets/Scenes.meta
	dragonstomp/Assets/Scenes/TestScene.unity.meta
	dragonstomp/Assets/Scripts.meta
	dragonstomp/Assets/Sprites.meta
	dragonstomp/Assets/Sprites/Dragon/DragonSpriteAnimation.prefab.meta
	dragonstomp/Assets/Sprites/Dragon/DragonSpriteCollection
Data/DragonSpriteCollection.prefab.meta
	dragonstomp/Assets/Sprites/Dragon/DragonSpriteCollection Data/atlas0
material.mat.meta
	dragonstomp/Assets/TK2DROOT/readme.rtf
	dragonstomp/Assets/TK2DROOT/tk2d/Code/Camera/tk2dCameraUtil.cs.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Code/Fonts/tk2dFont.cs.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Code/Fonts/tk2dTextGeomGen.cs.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Code/Gui/tk2dButton.cs.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Code/Runtime/tk2dResource.cs

	dragonstomp/Assets/TK2DROOT/tk2d/Code/Sprites/tk2dPixelPerfectHelper.cs.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Editor/EditorUtility.shader.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Editor/Runtime/tk2dResourceEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2d/Editor/Sprites/tk2dSpriteCollectionBuilderDeprecated.cs

	dragonstomp/Assets/TK2DROOT/tk2d/Editor/Sprites/tk2dSpriteCollectionPlatformBuilder.cs
	dragonstomp/Assets/TK2DROOT/tk2d/Editor/tk2dExternal.dll
	dragonstomp/Assets/TK2DROOT/tk2d/Editor/tk2dSkin.dll
	dragonstomp/Assets/TK2DROOT/tk2d/Goodies/PlayMaker
Actions.unitypackage.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/AdditiveVertexColor.shader

	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/AdditiveVertexColor.shader.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/Blend2TexVertexColor.shader

	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/Blend2TexVertexColor.shader.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/CutoutVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/CutoutVertexColor.shader.meta
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/LitBlendVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/LitCutoutVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/LitPremulVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/LitSolidVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/PremulVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/SolidVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/goodies/PackedTextMesh.shader

	dragonstomp/Assets/TK2DROOT/tk2d/Shaders/resources/BlendVertexColor.shader
	dragonstomp/Assets/TK2DROOT/tk2dTileMap/Code/tk2dTileMap.cs

	dragonstomp/Assets/TK2DROOT/tk2dTileMap/Code/tk2dTileMapColliderBuilder.cs
	dragonstomp/Assets/TK2DROOT/tk2dTileMap/Editor/tk2dTileMapScratchpad.cs
	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/1 - Tilemap
Demo.unity.meta
	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/Prefabs.meta
	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/Scripts.meta
	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/Textures.meta
	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/Textures/rocks.png

	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteCollection
Data/atlas0.png

	dragonstomp/Assets/TK2DROOT/tk2dTileMap_demo/Demo1/TilemapdemoSpriteCollection
Data/atlas0.png.meta

	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIBaseItemControl.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIDragItem.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIDropDownItem.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIDropDownMenu.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIHoverItem.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIMultiStateToggleButton.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIProgressBar.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIScrollableArea.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIScrollbar.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUISoundItem.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUITextInput.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIToggleButton.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIToggleButtonGroup.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIToggleControl.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUITweenItem.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIUpDownButton.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Controls/tk2dUIUpDownHoverButton.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Core/tk2dUIAudioManager.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Core/tk2dUIItem.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Core/tk2dUIManager.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Code/Core/tk2dUITouch.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIBaseItemControlEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIControlsHelperEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUICustomEditorGUILayout.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIDragItemEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIDropDownMenuEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIHoverItemEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIMultiStateToggleButtonEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIProgressBarEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIScrollableAreaEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIScrollbarEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUISoundItemEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUITextInputEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIToggleButtonEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIToggleButtonGroupEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIToggleControlEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUITweenItemEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIUpDownButtonEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Controls/tk2dUIUpDownHoverButtonEditor.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Core/tk2dUIItemEditor.cs

	dragonstomp/Assets/TK2DROOT/tk2dUI/Editor/Core/tk2dUILayoutContainerSizerEditor.cs
	dragonstomp/Assets/TK2DROOT/tk2dUI/Materials.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI/Shaders/DepthMask.shader
	dragonstomp/Assets/TK2DROOT/tk2dUI/Shaders/DepthMaskSolid.shader
	dragonstomp/Assets/TK2DROOT/tk2dUIManual.pdf.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/3 - 3D UI/3D/Materials.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/3 - 3D
UI/3D/background.png.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/3 - 3D UI/3D/button.fbx.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/3 - 3D UI/3D/button.png.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/3 - 3D
UI/LightmapFar-0.exr.meta
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/Assets/Dark/UIDemoDark
Data/atlas0.png.meta

	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/Assets/Font/OldSansBlack/OldSansBlack.fnt
	dragonstomp/Assets/TK2DROOT/tk2dUI_demo/tk2dUIDemoController.cs
	dragonstomp/Assets/TK2DROOT/tk2d_demo/demobmfont/test.fnt

	dragonstomp/Assets/TK2DROOT/tk2d_demo/democameradata/source/democamerafont.fnt
	dragonstomp/Assets/TK2DROOT/tk2d_demo/demogradientfont/grad.png.meta

	dragonstomp/Assets/TK2DROOT/tk2d_demo/demospritecollection/SpriteCollection_Data/atlas.png.meta

	dragonstomp/Assets/TK2DROOT/tk2d_demo/runtimespritecollection/RuntimeTexture.psd.meta
	dragonstomp/Library/CurrentLayout.dwlt
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript.dll
	dragonstomp/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	dragonstomp/Library/assetDatabase3
	dragonstomp/Library/expandedItems
	dragonstomp/Library/metadata/01/01c40b04df14a8a4f91c6cb4b29b663a
	dragonstomp/Library/metadata/04/049f704fd02f3f0409f217422d738767
	dragonstomp/Library/metadata/05/05e94b4bbc969f84fa49b6ae9e043b6e
	dragonstomp/Library/metadata/06/063b15d80dbb4604d890600a64c79cf8
	dragonstomp/Library/metadata/06/0678e3c4b51007642913ef4658064c4c
	dragonstomp/Library/metadata/06/06c963169e36c4b1f9fab9942c879e22
	dragonstomp/Library/metadata/08/08bddf830c046e34a9c605ed5d0874d1
	dragonstomp/Library/metadata/0b/0b225a7e956bd4bacba2e2c22b80227f
	dragonstomp/Library/metadata/0b/0b865323c20fa3f4899edc5d62a706fe
	dragonstomp/Library/metadata/0e/0e0d6f289321f384187378b9b4721b61
	dragonstomp/Library/metadata/0e/0e7f40ae3b54c7e4eb5ed453b855a8a0
	dragonstomp/Library/metadata/14/14082c7e1dd906b498d3c890151e046d
	dragonstomp/Library/metadata/27/2792d545ce9ea4979b74984ecf4246c3
	dragonstomp/Library/metadata/2c/2cbb6fbed2bf30741b4dba358f7f2146
	dragonstomp/Library/metadata/3a/3ae12f88ad2394ad0950214f6655d10d
	dragonstomp/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	dragonstomp/Library/metadata/49/493a7e5524e144665a1309f36ad2ddef
	dragonstomp/Library/metadata/4a/4ac3ab2437c684d439506d1ac4a79d2e
	dragonstomp/Library/metadata/59/59c767476a8c049ce9937ada9730e7e8
	dragonstomp/Library/metadata/5a/5a1a19253864947c4b0e53e1beff9f6f
	dragonstomp/Library/metadata/5b/5b9fac241be038041b70ac7e84cd6151
	dragonstomp/Library/metadata/64/6418b856c3b750249924348f89295b1d
	dragonstomp/Library/metadata/6a/6abdf3241ce81204293a7d50f971e3d7
	dragonstomp/Library/metadata/75/7553caa2b37f3c341834860c8b3f06de
	dragonstomp/Library/metadata/77/77eb27f07a7d044a2ad49419a0c9d46a
	dragonstomp/Library/metadata/7f/7f682663863332145a5470bc010cfe25
	dragonstomp/Library/metadata/81/8184f7ea90eca7a4d9714c682ca2b311
	dragonstomp/Library/metadata/85/856a0a5d88afa554990a187eb89800c4
	dragonstomp/Library/metadata/8d/8d66feac620104c9d94fd5e71e94fd56
	dragonstomp/Library/metadata/8e/8e4cc190d5dda4b728b73cfbbd797bd8
	dragonstomp/Library/metadata/8f/8fdcd786f6d4d1a42872d6175178c508
	dragonstomp/Library/metadata/90/9007a166370534bb984c2f36c8b4ce2a
	dragonstomp/Library/metadata/93/93300bced879604448173bc467850ddd
	dragonstomp/Library/metadata/94/944589023f6196b41ad19cc754aea098
	dragonstomp/Library/metadata/96/960187f04be046742bd8642bbf54c995
	dragonstomp/Library/metadata/97/97dfd85d1f3731f45a5ea74fa401d0a5
	dragonstomp/Library/metadata/ad/ad716fb3faa62c046bc79cb8ed2b2fdb
	dragonstomp/Library/metadata/b2/b2580843702051c47ac89024a50814a9
	dragonstomp/Library/metadata/b2/b2c20aa4a7b454b489ce2bf57c5daedd
	dragonstomp/Library/metadata/b8/b8b9fb6b575e5914c9d0248fb3d32103
	dragonstomp/Library/metadata/b9/b99ccc7a8e0d047b5ba9f0707126a407
	dragonstomp/Library/metadata/bd/bd380080945581c4d9dd93ba71bf4700
	dragonstomp/Library/metadata/c8/c841331f6cc22be458533fd2a5b470cd
	dragonstomp/Library/metadata/cc/cc41ed60e76204ad8b8ceb5cd7873729
	dragonstomp/Library/metadata/d0/d09c95902d7b64b389a4a51954b26537
	dragonstomp/Library/metadata/da/da1dec9244ae6454eaa30267723a030a
	dragonstomp/Library/metadata/dc/dc3a6a19948101b44801baea20f472fc
	dragonstomp/Library/metadata/dc/dcb29c92217a21f4ca7bb8392549aeab
	dragonstomp/Library/metadata/f7/f7daddfd9c08919429e6ffff8d0e860d
	dragonstomp/Library/metadata/fd/fd77cb35506a9bb4fb5d41e01e843724
	dragonstomp/Library/shadercompiler-1.log
	dragonstomp/dragonstomp-csharp.sln
	dragonstomp/dragonstomp.sln