Merge remote-tracking branch 'origin/master'

Conflicts:
	CameraCapture/bin/x86/Debug/Example.CameraCapture.exe
	CameraCapture/bin/x86/Debug/Example.CameraCapture.pdb

	CameraCapture/obj/x86/Debug/CameraCapture.Properties.Resources.resources
	CameraCapture/obj/x86/Debug/CameraCapture.csproj.FileListAbsolute.txt
	CameraCapture/obj/x86/Debug/CameraCapture.csproj.GenerateResource.Cache

	CameraCapture/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CameraCapture/obj/x86/Debug/Example.CameraCapture.exe
	CameraCapture/obj/x86/Debug/Example.CameraCapture.pdb
	CameraCapture/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
Merge branch 'master' of https://github.com/qiaorancho/eliball