Merge branch 'master' of ssh://obertrand.dyndns.org:50022/media/server/git/toolbox-navigation

Conflicts:
	doc/build/doctrees/analysing.doctree
	doc/build/doctrees/comparing.doctree
	doc/build/doctrees/computing.doctree
	doc/build/doctrees/database.doctree
	doc/build/doctrees/environment.pickle
	doc/build/doctrees/gettingstarted.doctree
	doc/build/doctrees/index.doctree
	doc/build/doctrees/moving.doctree
	doc/build/doctrees/processing.doctree
	doc/build/doctrees/rendering.doctree
	doc/build/html/.buildinfo
	doc/build/html/_images/apcv.png
	doc/build/html/_images/contrast_weighted_nearness.png
	doc/build/html/_images/load_image_posorient.png
	doc/build/html/_images/load_image_rowid.png
	doc/build/html/_images/michelson_contrast.png
	doc/build/html/_images/scene.png
	doc/build/html/_images/skyline.png
	doc/build/html/_modules/index.html
	doc/build/html/_sources/database.rst.txt
	doc/build/html/_sources/processing.rst.txt
	doc/build/html/_sources/rendering.rst.txt
	doc/build/html/_static/alabaster.css
	doc/build/html/_static/basic.css
	doc/build/html/_static/doctools.js
	doc/build/html/_static/jquery.js
	doc/build/html/_static/pygments.css
	doc/build/html/_static/searchtools.js
	doc/build/html/_static/underscore.js
	doc/build/html/_static/websupport.js
	doc/build/html/analysing.html
	doc/build/html/comparing.html
	doc/build/html/computing.html
	doc/build/html/database.html
	doc/build/html/example/database/load_image_posorient.hires.png
	doc/build/html/example/database/load_image_posorient.pdf
	doc/build/html/example/database/load_image_posorient.png
	doc/build/html/example/database/load_image_posorient.py
	doc/build/html/example/database/load_image_rowid.hires.png
	doc/build/html/example/database/load_image_rowid.pdf
	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
	doc/build/html/example/processing/contrast_weighted_nearness.hires.png
	doc/build/html/example/processing/contrast_weighted_nearness.pdf
	doc/build/html/example/processing/contrast_weighted_nearness.png
	doc/build/html/example/processing/contrast_weighted_nearness.py
	doc/build/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
	doc/build/html/example/processing/skyline.pdf
	doc/build/html/example/processing/skyline.png
	doc/build/html/example/processing/skyline.py
	doc/build/html/genindex.html
	doc/build/html/gettingstarted.html
	doc/build/html/index.html
	doc/build/html/moving.html
	doc/build/html/objects.inv
	doc/build/html/processing.html
	doc/build/html/py-modindex.html
	doc/build/html/rendering.html
	doc/build/html/search.html
	doc/build/html/searchindex.js
	doc/build/plot_directive/example/database/load_image_posorient.hires.png
	doc/build/plot_directive/example/database/load_image_posorient.pdf
	doc/build/plot_directive/example/database/load_image_posorient.png
	doc/build/plot_directive/example/database/load_image_rowid.hires.png
	doc/build/plot_directive/example/database/load_image_rowid.pdf
	doc/build/plot_directive/example/database/load_image_rowid.png
	doc/build/plot_directive/example/processing/apcv.hires.png
	doc/build/plot_directive/example/processing/apcv.pdf
	doc/build/plot_directive/example/processing/apcv.png
	doc/build/plot_directive/example/processing/contrast_weighted_nearness.hires.png
	doc/build/plot_directive/example/processing/contrast_weighted_nearness.pdf
	doc/build/plot_directive/example/processing/contrast_weighted_nearness.png
	doc/build/plot_directive/example/processing/michelson_contrast.hires.png
	doc/build/plot_directive/example/processing/michelson_contrast.pdf
	doc/build/plot_directive/example/processing/michelson_contrast.png
	doc/build/plot_directive/example/processing/scene.hires.png
	doc/build/plot_directive/example/processing/scene.pdf
	doc/build/plot_directive/example/processing/scene.png
	doc/build/plot_directive/example/processing/skyline.hires.png
	doc/build/plot_directive/example/processing/skyline.pdf
	doc/build/plot_directive/example/processing/skyline.png
	doc/source/database.rst
	doc/source/example/database/load_image_posorient.py
	doc/source/example/database/load_image_rowid.py
	doc/source/example/processing/apcv.py
	doc/source/example/processing/contrast_weighted_nearness.py
	doc/source/example/processing/michelson_contrast.py
	doc/source/example/processing/pcv.py
	doc/source/example/processing/scene.py
	doc/source/example/processing/skyline.py
	doc/source/processing.rst
	doc/source/rendering.rst
	navipy/database/__init__.py
	navipy/processing/__init__.py
	todo