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
ocl_calcOpticalFlowPyrLK optimizations

1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
Update out.cpp

Fixed a bug with the cv::format(cv::Mat, ...) method for matrices with only one row

see http://answers.opencv.org/question/21201/cvformat-does-not-format-the-way-it-should/?answer=23945#post-id-23945 for details
increase epsilon for MOG2::getBackgroundImage test:

it uses float arithmetics
Merge pull request #2541 from JinoBetti:2.4
fixed C4505
doc typos
Merge pull request #2548 from jet47:gpu_mog2_test
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
Merge pull request #2553 from ilya-lavrenov:typo
OpenCV version++. OpenCV Manager version++.
Merge pull request #2554 from asmorkalov:ocv_249_version
Added IPP Async converters, doc and sample
Added SharedMatrix
enable IPP ICV support