Merge modifications for HYDRO project (origin/hydro/imps_2017_salome_83 branch)

diff --cc src/OCCViewer/OCCViewer_ViewWindow.h
index 69be9156c74bc82cb2c8915f6e8d4292a6ccff3e,ba1a6ddad55f5246d00c4c633eabb56d2055f83f..57165f3bff5cfb7df4a4968352e164fca3dbc966
--- 1/src/OCCViewer/OCCViewer_ViewWindow.h
--- 2/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.h
@@@ -273,9 -274,8 +273,11 @@@ public
  
    virtual SUIT_CameraProperties   cameraProperties();
  
 +  bool isActionVisible( ActionId theId ) const;
 +  void setActionVisible( ActionId theId, bool isVisible );
 +
+   void resetState();
+ 
  public slots:
    virtual void onFrontView();
    virtual void onViewFitAll();