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.
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
fixed slow down in getRectSubPix (original patch by Markus JR Mueller); removed some unused variables and functions
added UMat::setTo accuracy test
ipp: added support for updated ICV package
ipp: some functions are not available in the ICV package
ipp: some functions are not available in the ICV package #2
Merge pull request #2596 from ilya-lavrenov:tapi_setto
Merge pull request #2589 from alalek:icv_update
Merge pull request #2588 from vpisarev:fix_samples_n_unused
Merge pull request #2067 from pemmanuelviel:groupWiseCenterChooser
Merge pull request #2390 from nicolasmartin3d:master_bug3546
Merge pull request #1932 from seth-planet:master