Merge branch 'V7_7_BR' into hydro/imps_2015

diff --cc doc/salome/gui/input/setting_preferences.doc
Simple merge

diff --cc src/LightApp/LightApp_Application.cxx
Simple merge

diff --cc src/LightApp/resources/LightApp.xml
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_en.ts
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_fr.ts
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_ja.ts
Simple merge

diff --cc src/OCCViewer/OCCViewer_ViewWindow.cxx
index 6dfe7d49d40703dc95f62e994efac12a280c407f,a0e96792bba525452df09cffa38363629dd3dc4c..0852d0b29ee64b69ac6c25019e3e6871f7e8f9c7
--- 1/src/OCCViewer/OCCViewer_ViewWindow.cxx
--- 2/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@@ -1146,10 -1172,8 +1172,10 @@@ void OCCViewer_ViewWindow::createAction
  {
    if( !toolMgr()->isEmpty() )
      return;
-   
+ 
    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
 +  if( !aResMgr )
 +    return;
  
    QtxAction* aAction;