# Conflicts:
#	modules/dnn/include/opencv2/dnn/blob.hpp
#	modules/dnn/src/init.cpp
#	modules/dnn/src/layers/concat_layer.cpp
#	modules/dnn/src/layers/convolution_layer.cpp
#	modules/dnn/src/layers/convolution_layer.hpp
#	modules/dnn/src/layers/layers_common.cpp
#	modules/dnn/src/layers/layers_common.hpp
#	modules/dnn/src/layers/op_im2col.hpp
#	modules/dnn/src/layers/pooling_layer.cpp
#	modules/dnn/src/layers/pooling_layer.hpp

minor refactoring

added more tests

minor

fixed warnings

minor

minor

minor

fixed comment

Implemented a learning-based color balance algorithm, which typically provides
noticeably better quality than grayworld, while being several times slower.
Added a python script for training this algorithm, as well as the benchmarking script
for objective quality evaluation.

Also made some modifications to the grayworld algorithm implementation, including the
16 bit image support and overall acceleration by about 1.7 times (for 8 bit images).

Moving more Caffe loaders to sparate file