Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv...

Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4

Conflicts:
	modules/features2d/src/orb.cpp

modules/features2d/src/orb.cpp

@@ -38,6 +38,10 @@
 #include "opencl_kernels_features2d.hpp"
 #include <iterator>
 
+#ifndef CV_IMPL_ADD
+#define CV_IMPL_ADD(x)
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace cv