Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder

Update 1

update 2

Update 3

Update 4

Update 5

update 6

Update 7

Update 8

Update 9

Update 10

Update 11

Update 12

Update 13

Update 14

Update 15

Update 16

Update 17

Update 18

Update 19

Update 20

Update 21

Update 22

Removed Headers

Update 23

Update 24

Update 25

Update 26

Update 27

Update 28

All 3 modules Updated

Both modules added

initialize TIMES variable with some default value (10)

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

- Added author provided fixes
- Added code example
- Added documentation fixes

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

Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs

Fix image to be used by perf test.

HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.