Merge remote-tracking branch 'origin/V7_8_BR' into hydro/imps_2015

Conflicts:
	CMakeLists.txt
	src/SalomeApp/salome_pluginsmanager.py

diff --cc CMakeLists.txt
index 3b4f3ceca2748e9854cb01226332042b6f7cbe8b,67d784138613af2c79cd65e6337afbe2c1c89c65..c10aa25c92e41e3d234fadb1a4055bcec1c7ca3f
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,8 -30,8 +30,8 @@@ CMAKE_POLICY(SET CMP0003 NEW
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
  SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
- SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+ SET(${PROJECT_NAME_UC}_MINOR_VERSION 8)
 -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)

diff --cc doc/salome/tui/doxyfile.in
Simple merge