commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	SampleEditorsDevExpress/SampleEditorsDevExpress.suo

	SampleEditorsDevExpress/SampleEditorsDevExpress/bin/Debug/SampleEditorsDevExpress.exe

	SampleEditorsDevExpress/SampleEditorsDevExpress/bin/Debug/SampleEditorsDevExpress.pdb

	SampleEditorsDevExpress/SampleEditorsDevExpress/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SampleEditorsDevExpress/SampleEditorsDevExpress/obj/x86/Debug/SampleEditorsDevExpress.csproj.FileListAbsolute.txt

	SampleEditorsDevExpress/SampleEditorsDevExpress/obj/x86/Debug/SampleEditorsDevExpress.csproj.GenerateResource.Cache

	SampleEditorsDevExpress/SampleEditorsDevExpress/obj/x86/Debug/SampleEditorsDevExpress.exe

	SampleEditorsDevExpress/SampleEditorsDevExpress/obj/x86/Debug/SampleEditorsDevExpress.pdb