Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images
Don't automatically convert to grayscale (keep previous behavior.)
Merge branch 'master' of https://github.com/Itseez/opencv

Conflicts:
	modules/imgproc/src/sumpixels.cpp
Add a new method for initializing KMeans centers that leads to better clusters and thus better retrieval when final centers have to be existing keypoints instead of clusters barycenters.
New KNN code -should compile now
function code
some fixes
Do not build apple objective-c codes if using gcc
Merge branch 'master' of https://github.com/Itseez/opencv

Conflicts:
	modules/features2d/include/opencv2/features2d.hpp
	modules/features2d/src/freak.cpp
	modules/features2d/src/stardetector.cpp
Python typdef fixed. Reverted the example to MOG2. Not time to make the command line switch for now.
Prototype OCL version of gaussian blur with integer arithmetic
Added integer arithmetic to sepFilter2D
Small refactoring
Enabled integer arithmetic for row_filter_C1_D0
Enabled integer arithmetic for filterSepSinglePass
Update crop_face.py

I propose some changes, to automate file cropping
fix condition in CV_OperationsTest::operations1()
Fix typos in old python wrapper documentation(Bug #3628)

Fixed spelling of CV_INTER_LINEAR flag in geometric_transformations.rst
Added  ippiSqrDistanceNorm and ippiCrossCorrNorm to cv::matchTemplate
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions