Merge branch 'hydro/imps_2015' into V7_dev

diff --cc CMakeLists.txt
index 33efb9f106343e0abf0628f228dd41309bb5443b,08f74713394c0b9db53c69d8a5eeadbc612731dc..312c48e842c6af0a4a3fd42841bf1fbefcb4c6cd
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -29,10 -29,10 +29,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
  SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
- SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+ SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
  SET(${PROJECT_NAME_UC}_VERSION
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 -SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Find KERNEL
  # ===========