alignment of parameters as per speclad
Merge pull request #1389 from SpecLad:merge-2.4
Merge branch 'master' into gpu-cuda-rename

Conflicts:
	modules/cudaoptflow/perf/perf_optflow.cpp
	modules/cudaoptflow/src/tvl1flow.cpp
	samples/gpu/stereo_multi.cpp
Added the performance test for mog and mog2.
Removed whitespace.
fixed warnings in resize.cu
Merge pull request #1373 from abidrahmank:pykeypoints
updated .gitignore
Fix a bug of ocl retina on NVIDIA platform.
Fixed a bug in FLANN resulting in uninitialized accesses.

This is fixed upstream in mariusmuja/flann@b615f26, but that fix
would break binary compatibility, so I had to make a different one.

Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
Merge pull request #1397 from ilya-lavrenov:gitignore
Merged with HEAD and removed C interface to rotatedRectangleIntersection
small changes in the tutorial
Merge pull request #1392 from SpecLad:flann-uninit
Removed IOArray constness.
Delete a bunch more trailing whitespace that slipped through the cracks.
Added the ability to have samples inside a module.
changed data path and eps
Fixed OCL samples' install path being inconsistent with the other samples.
enabled gemm and dft erf test