Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	WindowsFormsApplication1/WindowsFormsApplication1.v12.suo

	WindowsFormsApplication1/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	WindowsFormsApplication1/WindowsFormsApplication1/obj/Debug/WindowsFormsApplication1.csproj.FileListAbsolute.txt