Merge branch 'develop'

# Conflicts:
#	Source/Assets/TouchScript/Editor/Gestures/Base/PinnedTransformGestureBaseEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/Base/TransformGestureBaseEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/FlickGestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/GestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/LongPressGestureEditor.cs
#	Source/Assets/TouchScript/Editor/Gestures/TapGestureEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/InputSourceEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/MobileInputEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/MouseInputEditor.cs
#	Source/Assets/TouchScript/Editor/InputSources/StandardInputEditor.cs
#	Source/Assets/TouchScript/Examples/Cube/Scripts/LayerDelegate.cs
#	Source/Assets/TouchScript/Examples/Cube/Scripts/RedirectInput.cs
#	Source/Assets/TouchScript/Scripts/Devices/Display/GenericDisplayDevice.cs
#	Source/Assets/TouchScript/Scripts/TouchManager.cs
#	Source/ProjectSettings/ProjectSettings.asset
#	Source/ProjectSettings/ProjectVersion.txt
#	Source/ProjectSettings/UnityConnectSettings.asset

Author: valyard

.gitignore

@@ -4,80 +4,8 @@
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-*.userprefs
-*.pidb
 .vs
-
-# Build results
-*_i.c
-*_p.c
-*.ilk
-*.obj
-*.pch
-*.pdb
-*.mdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# Installshield output folder 
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-*.Cache
-ClientBin
-stylecop.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
+TouchScript.userprefs
+TouchScript.v12.suo
 
 TouchScript.unitypackage

AssetStore/Assets/AssetStoreTools/Editor/AssetStoreTools.dll

@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!236 &1
+ClusterInputManager:
+  m_ObjectHideFlags: 0
+  m_Inputs: []

AssetStore/Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta

@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 4
+  serializedVersion: 5
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -21,14 +21,17 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
+  m_ShaderSettings:
+    useScreenSpaceShadows: 1
+  m_BuildTargetShaderSettings: []
   m_LightmapStripping: 0
+  m_FogStripping: 0
   m_LightmapKeepPlain: 1
   m_LightmapKeepDirCombined: 1
   m_LightmapKeepDirSeparate: 1
   m_LightmapKeepDynamicPlain: 1
   m_LightmapKeepDynamicDirCombined: 1
   m_LightmapKeepDynamicDirSeparate: 1
-  m_FogStripping: 0
   m_FogKeepLinear: 1
   m_FogKeepExp: 1
   m_FogKeepExp2: 1