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

ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.

- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces

This reverts commit fba72cb6, reversing
changes made to 02131ffb.

All errors were found by doc/check_docs2.py

All errors were found by doc/check_docs2.py