Merge branch 'develop' into update-shark-rf

CMake/FindOssim.cmake

CMake/UseSWIGLocal.cmake

CMakeLists.txt

Documentation/Cookbook/Art/contrast1.png

Documentation/Cookbook/Art/contrast2.png

Documentation/Cookbook/Art/contrast4.png

Documentation/Cookbook/Art/contrast_orig.jpg

Documentation/Cookbook/Art/contrast_result.jpg

Documentation/Cookbook/rst/FAQ.rst

Documentation/Cookbook/rst/Installation.rst

Documentation/Cookbook/rst/Installation_Linux.txt

Documentation/Cookbook/rst/Installation_Macx.txt

Documentation/Cookbook/rst/Installation_Windows.txt

Documentation/Cookbook/rst/Recipes.rst

Documentation/Cookbook/rst/recipes/contrast_enhancement.rst

Documentation/Cookbook/rst/recipes/optpreproc.rst

Documentation/Cookbook/rst/recipes/pbclassif.rst

Documentation/Cookbook/rst/recipes/residual_registration.rst

Documentation/Latex/style_for_html.cfg

Documentation/SoftwareGuide/Art/Cube_HPX.eps