Merge branch 'BR_H2018_2' into pre/V9_3_BR_HYDRO

diff --cc resources/CMakeLists.txt
index 2510cb0fc70a7009a7fda43c0a33aff39af46660,ff1e39d944425c065e9f18710c59e2d260b6a2b5..c3ee7762821bd830f1127cb2f6b40fdbf8ee28d7
mode 100644,100755..100644
--- 1/resources/CMakeLists.txt
--- 2/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt

diff --cc src/CurveCreator/CMakeLists.txt
Simple merge

diff --cc src/CurveCreator/CurveCreator_Curve.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Curve.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Diff.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Diff.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Displayer.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Operation.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Operation.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Section.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_TreeView.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_TreeView.h
Simple merge

diff --cc src/CurveCreator/CurveCreator_Utils.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Utils.hxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_UtilsICurve.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Widget.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Widget.h
Simple merge

diff --cc src/GEOMGUI/GEOM_msg_en.ts
index e1010522be759e25bcbed481fa428bc6f40fe137,87e293afcc933e156a4c2151da9a7b7d379e9ad3..87e293afcc933e156a4c2151da9a7b7d379e9ad3
mode 100644,100755..100644
--- 1/src/GEOMGUI/GEOM_msg_en.ts
--- 2/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts

diff --cc src/GEOM_I/GEOM_Gen_i.cc
Simple merge