merge resolve

doc/build/html/example/database/load_image_rowid.png

doc/build/html/example/database/load_image_rowid.py

doc/build/html/example/processing/apcv.hires.png

doc/build/html/example/processing/apcv.pdf

doc/build/html/example/processing/apcv.png

doc/build/html/example/processing/apcv.py

...l/example/processing/contrast_weighted_nearness.hires.png

...ld/html/example/processing/contrast_weighted_nearness.pdf

...ld/html/example/processing/contrast_weighted_nearness.png

...ild/html/example/processing/contrast_weighted_nearness.py

...uild/html/example/processing/michelson_contrast.hires.png

doc/build/html/example/processing/michelson_contrast.pdf

doc/build/html/example/processing/michelson_contrast.png

doc/build/html/example/processing/michelson_contrast.py

doc/build/html/example/processing/pcv.py

doc/build/html/example/processing/scene.hires.png

doc/build/html/example/processing/scene.pdf

doc/build/html/example/processing/scene.png

doc/build/html/example/processing/scene.py

doc/build/html/example/processing/skyline.hires.png