literalinclude

literalinclude, dropped :lines:

Seems correct to me and builds fine

Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.

This was reported in feature report #2182 (http://code.opencv.org/issues/2182). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.

initialize TIMES variable with some default value (10)

Conflicts:
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp

content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.

Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems

delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp