성현수정1
Merge branch 'master' of https://github.com/sunghyunL/meetingtable2

Conflicts:
	Server/MultiTouchServer.ver2.sdf
Merge branch 'master' of https://github.com/sunghyunL/meetingtable2

Conflicts:
	Server/MultiTouchServer.ver2.sdf
	Server/MultiTouchServer.ver2.v11.suo
	Tjssm Multi Touch Table/TouchFramework.v11.suo
성현2
Merge branch 'master' into HEAD

Conflicts:
	Tjssm Multi Touch Table/ProjectionExample/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/ProjectionExample/obj/Debug/ProjectionExample_MarkupCompile.i.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/Tjssm Multi Touch Table.exe
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/Tjssm Multi Touch Table.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.exe
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table_MarkupCompile.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table_MarkupCompile.i.cache
	Tjssm Multi Touch Table/TouchControls/Client/Jobs.cs
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchControls/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls_MarkupCompile.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls_MarkupCompile.i.cache
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchHelpers/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/WPFMitsuControls/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/WPFMitsuControls/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls_MarkupCompile.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls_MarkupCompile.i.cache
observerStop추가
Merge branch 'master' of https://github.com/sunghyunL/meetingtable2

Conflicts:
	Tjssm Multi Touch Table/ProjectionExample/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/ProjectionExample/obj/Debug/ProjectionExample_MarkupCompile.i.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/Tjssm Multi Touch Table.exe
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/Tjssm Multi Touch Table.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.csproj.FileListAbsolute.txt
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.exe
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table.pdb
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table_MarkupCompile.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table_MarkupCompile.i.cache
	Tjssm Multi Touch Table/Tjssm Multi Touch Table/obj/Debug/Tjssm Multi Touch Table_MarkupCompile.i.lref
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchControls/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchControls/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchControls/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls_MarkupCompile.cache
	Tjssm Multi Touch Table/TouchControls/obj/Debug/TouchControls_MarkupCompile.i.cache
	Tjssm Multi Touch Table/TouchFramework.v11.suo
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchFramework/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFramework/obj/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchControls.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchControls.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFramework.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFramework.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.dll
	Tjssm Multi Touch Table/TouchFrameworkTracking/obj/Debug/TouchFrameworkTracking.pdb
	Tjssm Multi Touch Table/TouchHelpers/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/WPFMitsuControls/bin/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/WPFMitsuControls/bin/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.csprojResolveAssemblyReference.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.dll
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls.pdb
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls_MarkupCompile.cache
	Tjssm Multi Touch Table/WPFMitsuControls/obj/Debug/WPFMitsuControls_MarkupCompile.i.cache