Merge branch 'BR_H2018_1' into TRUNK

diff --combined src/salome_hydro/CMakeLists.txt
index c6230ea5ce92b141cd77c34ade8f51f2f36badec,1d5ca3019567af6aa4a62eb2e8e710a86aaa5acf..f0b8cd921b243886d427c7eab25c7a9619a0677e
--- 1/src/salome_hydro/CMakeLists.txt
--- 2/src/salome_hydro/CMakeLists.txt
+++ b/src/salome_hydro/CMakeLists.txt
@@@ -15,9 -15,9 +15,9 @@@
  #  You should have received a copy of the GNU General Public License
  #  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
  
 -ADD_SUBDIRECTORY(mascaret)
 -ADD_SUBDIRECTORY(telemac2d)
 -ADD_SUBDIRECTORY(pytel)
 +ADD_SUBDIRECTORY(telma)
 +ADD_SUBDIRECTORY(param_study)
 +ADD_SUBDIRECTORY(run_study)
  ADD_SUBDIRECTORY(boundary_conditions)
  
  # --- Python files ---
@@@ -38,6 -38,7 +38,7 @@@ SET(UIFILE
  
  SET(TEMPLFILES
    interpolz.template
+   interpolz_b.template
    assignStrickler.template
  )