Fixed CR line endings in non_linear_svms.rst.
Merge pull request #1256 from kamjagin:2.4
Merge https://github.com/Itseez/opencv
Adjusted the camera calibration sample to master API.
Replaced isfinite() with cvIsInf and cvIsNan
LinkedList -> ArrayList
Merge pull request #1260 from SpecLad:no-cr-master
Missing including of nonfree module to support the use of SURF
detector/descriptor.
Merge pull request #1255 from SpecLad:no-cr
Merge pull request #1259 from pengx17:2.4_fix_cvtcolor
Merge pull request #18 from ozantonkal/implementing_camera

Implementing camera
CLAHE Python bindings
docs changes
docs changes
Update with apavlenko's suggestions.
Comparing rejected stage index with minimum required neighbors does not make sense

As described here, http://code.opencv.org/issues/3064, the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
Merge pull request #1162 from jet47:cudev-integration
Merge pull request #1245 from rdm12:doc_tutorial_camera_calibration
Merge pull request #1262 from StevenPuttemans:fix_surf_tutorial
Merge pull request #1263 from abidrahmank:pyCLAHE_24