Fixed Flann crash
Merge branch 'CPlusPlus-Improvement-features2d'

Conflicts:
	sample/CppStyleSamplesCS/CppStyleSamplesCS.csproj
	sample/CppStyleSamplesCS/OpenCvSharpExtern.dll
	src/OpenCvSharp.CPlusPlus/OpenCvSharpExtern.dll