diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 4d429e693..bf5867327 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -91,6 +91,7 @@ NL_CONFIGURE_CHECKS()
 #Platform specifics
 
 SETUP_EXTERNAL()
+NL_GEN_REVISION_H()
 
 IF(WIN32)
   SET(WINSOCK2_LIB ws2_32.lib)
diff --git a/code/CMakeModules/FindFreeType.cmake b/code/CMakeModules/FindFreeType.cmake
index b9d00d96a..4f3c84cbe 100644
--- a/code/CMakeModules/FindFreeType.cmake
+++ b/code/CMakeModules/FindFreeType.cmake
@@ -57,6 +57,13 @@ FIND_LIBRARY(FREETYPE_LIBRARY
 
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
   SET(FREETYPE_FOUND "YES")
+  IF(WITH_STATIC_EXTERNAL AND APPLE)
+    FIND_PACKAGE(BZip2)
+    IF(BZIP2_FOUND)
+      SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+      SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARY} ${BZIP2_LIBRARIES})
+    ENDIF(BZIP2_FOUND)
+  ENDIF(WITH_STATIC_EXTERNAL AND APPLE)
   IF(NOT FREETYPE_FIND_QUIETLY)
     MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARY}")
   ENDIF(NOT FREETYPE_FIND_QUIETLY)
diff --git a/code/CMakeModules/FindMercurial.cmake b/code/CMakeModules/FindMercurial.cmake
new file mode 100644
index 000000000..9c252ad17
--- /dev/null
+++ b/code/CMakeModules/FindMercurial.cmake
@@ -0,0 +1,108 @@
+# - Extract information from a subversion working copy
+# The module defines the following variables:
+#  Mercurial_HG_EXECUTABLE - path to hg command line client
+#  Mercurial_VERSION_HG - version of hg command line client
+#  Mercurial_FOUND - true if the command line client was found
+#  MERCURIAL_FOUND - same as Mercurial_FOUND, set for compatiblity reasons
+#
+# The minimum required version of Mercurial can be specified using the
+# standard syntax, e.g. FIND_PACKAGE(Mercurial 1.4)
+#
+# If the command line client executable is found two macros are defined:
+#  Mercurial_WC_INFO(<dir> <var-prefix>)
+#  Mercurial_WC_LOG(<dir> <var-prefix>)
+# Mercurial_WC_INFO extracts information of a subversion working copy at
+# a given location. This macro defines the following variables:
+#  <var-prefix>_WC_URL - url of the repository (at <dir>)
+#  <var-prefix>_WC_ROOT - root url of the repository
+#  <var-prefix>_WC_REVISION - current revision
+#  <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
+#  <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
+#  <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
+#  <var-prefix>_WC_INFO - output of command `hg info <dir>'
+# Mercurial_WC_LOG retrieves the log message of the base revision of a
+# subversion working copy at a given location. This macro defines the
+# variable:
+#  <var-prefix>_LAST_CHANGED_LOG - last log of base revision
+# Example usage:
+#  FIND_PACKAGE(Mercurial)
+#  IF(MERCURIAL_FOUND)
+#    Mercurial_WC_INFO(${PROJECT_SOURCE_DIR} Project)
+#    MESSAGE("Current revision is ${Project_WC_REVISION}")
+#    Mercurial_WC_LOG(${PROJECT_SOURCE_DIR} Project)
+#    MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
+#  ENDIF(MERCURIAL_FOUND)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Tristan Carel
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PROGRAM(Mercurial_HG_EXECUTABLE hg
+  DOC "mercurial command line client")
+MARK_AS_ADVANCED(Mercurial_HG_EXECUTABLE)
+
+IF(Mercurial_HG_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} --version
+    OUTPUT_VARIABLE Mercurial_VERSION_HG
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+	
+  STRING(REGEX REPLACE ".*version ([\\.0-9]+).*"
+    "\\1" Mercurial_VERSION_HG "${Mercurial_VERSION_HG}")
+	
+  MACRO(Mercurial_WC_INFO dir prefix)
+    EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} tip
+      WORKING_DIRECTORY ${dir}
+      OUTPUT_VARIABLE ${prefix}_WC_INFO
+      ERROR_VARIABLE Mercurial_hg_info_error
+      RESULT_VARIABLE Mercurial_hg_info_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    IF(NOT ${Mercurial_hg_info_result} EQUAL 0)
+      MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} tip\" failed with output:\n${Mercurial_hg_info_error}")
+    ELSE(NOT ${Mercurial_hg_info_result} EQUAL 0)
+
+      STRING(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
+        "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?changeset: *([0-9]+).*"
+        "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
+
+    ENDIF(NOT ${Mercurial_hg_info_result} EQUAL 0)
+
+  ENDMACRO(Mercurial_WC_INFO)
+
+  MACRO(Mercurial_WC_LOG dir prefix)
+    # This macro can block if the certificate is not signed:
+    # hg ask you to accept the certificate and wait for your answer
+    # This macro requires a hg server network access (Internet most of the time)
+    # and can also be slow since it access the hg server
+    EXECUTE_PROCESS(COMMAND
+      ${Mercurial_HG_EXECUTABLE} --non-interactive log -r BASE ${dir}
+      OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
+      ERROR_VARIABLE Mercurial_hg_log_error
+      RESULT_VARIABLE Mercurial_hg_log_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    IF(NOT ${Mercurial_hg_log_result} EQUAL 0)
+      MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Mercurial_hg_log_error}")
+    ENDIF(NOT ${Mercurial_hg_log_result} EQUAL 0)
+  ENDMACRO(Mercurial_WC_LOG)
+ENDIF(Mercurial_HG_EXECUTABLE)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Mercurial DEFAULT_MSG Mercurial_HG_EXECUTABLE)
diff --git a/code/CMakeModules/GetRevision.cmake b/code/CMakeModules/GetRevision.cmake
new file mode 100644
index 000000000..ee3fa2e90
--- /dev/null
+++ b/code/CMakeModules/GetRevision.cmake
@@ -0,0 +1,59 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3)
+
+# ROOT_DIR should be set to root of the repository (where to find the .svn or .hg directory)
+# SOURCE_DIR should be set to root of your code (where to find CMakeLists.txt)
+
+# Replace spaces by semi-columns
+IF(CMAKE_MODULE_PATH)
+  STRING(REPLACE " " ";" CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+ENDIF(CMAKE_MODULE_PATH)
+
+SET(CMAKE_MODULE_PATH ${SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
+
+IF(NOT ROOT_DIR AND SOURCE_DIR)
+  SET(ROOT_DIR ${SOURCE_DIR})
+ENDIF(NOT ROOT_DIR AND SOURCE_DIR)
+
+IF(NOT SOURCE_DIR AND ROOT_DIR)
+  SET(SOURCE_DIR ${ROOT_DIR})
+ENDIF(NOT SOURCE_DIR AND ROOT_DIR)
+
+MACRO(NOW RESULT)
+  IF (WIN32)
+    EXECUTE_PROCESS(COMMAND "wmic" "os" "get" "localdatetime" OUTPUT_VARIABLE DATETIME)
+    IF(NOT DATETIME MATCHES "ERROR")
+      STRING(REGEX REPLACE ".*\n([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9]).*" "\\1-\\2-\\3 \\4:\\5:\\6" ${RESULT} "${DATETIME}")
+    ENDIF(NOT DATETIME MATCHES "ERROR")
+  ELSEIF(UNIX)
+    EXECUTE_PROCESS(COMMAND "date" "+'%Y-%m-%d %H:%M:%S'" OUTPUT_VARIABLE ${RESULT})
+  ELSE (WIN32)
+    MESSAGE(SEND_ERROR "date not implemented")
+    SET(${RESULT} "0000-00-00 00:00:00")
+  ENDIF (WIN32)
+ENDMACRO(NOW)
+
+IF(EXISTS "${ROOT_DIR}/.svn/")
+  FIND_PACKAGE(Subversion)
+
+  IF(SUBVERSION_FOUND)
+    Subversion_WC_INFO(${ROOT_DIR} ER)
+    SET(REVISION ${ER_WC_REVISION})
+  ENDIF(SUBVERSION_FOUND)
+ENDIF(EXISTS "${ROOT_DIR}/.svn/")
+
+IF(EXISTS "${ROOT_DIR}/.hg/")
+  FIND_PACKAGE(Mercurial)
+
+  IF(MERCURIAL_FOUND)
+    Mercurial_WC_INFO(${ROOT_DIR} ER)
+    SET(REVISION ${ER_WC_REVISION})
+  ENDIF(MERCURIAL_FOUND)
+ENDIF(EXISTS "${ROOT_DIR}/.hg/")
+
+IF(REVISION)
+  IF(EXISTS ${SOURCE_DIR}/revision.h.in)
+    NOW(BUILD_DATE)
+    CONFIGURE_FILE(${SOURCE_DIR}/revision.h.in revision.h.txt)
+    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy revision.h.txt revision.h) # copy_if_different
+  ENDIF(EXISTS ${SOURCE_DIR}/revision.h.in)
+ENDIF(REVISION)
diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index bb34aebfe..ae5b30ee2 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -8,44 +8,40 @@
 #   ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use
 #   ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
+IF(MSVC)
+	SET(PCHSupport_FOUND TRUE)
+	SET(_PCH_include_prefix "/I")
+ELSE(MSVC)
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+			ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+			OUTPUT_VARIABLE gcc_compiler_version)
 
-	EXEC_PROGRAM(
-		${CMAKE_CXX_COMPILER}
-		ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-		OUTPUT_VARIABLE gcc_compiler_version)
-
-	IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-		SET(PCHSupport_FOUND TRUE)
-	ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-		IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+		IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
 			SET(PCHSupport_FOUND TRUE)
-		ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-	ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+		ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+			IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+				SET(PCHSupport_FOUND TRUE)
+			ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+		ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+	ELSE(CMAKE_COMPILER_IS_GNUCXX)
+		# TODO: make tests for other compilers than GCC
+		SET(PCHSupport_FOUND TRUE)
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 	SET(_PCH_include_prefix "-I")
-
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-
-	IF(WIN32)
-		SET(PCHSupport_FOUND TRUE) # for experimental msvc support
-		SET(_PCH_include_prefix "/I")
-	ELSE(WIN32)
-		SET(PCHSupport_FOUND FALSE)
-	ENDIF(WIN32)
-
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(MSVC)
 
 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
 	STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
 	SET(${_out_compile_flags} ${${_flags_var_name}} )
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
+	IF(NOT MSVC)
 		GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
 		IF(${_targetType} STREQUAL SHARED_LIBRARY OR ${_targetType} STREQUAL MODULE_LIBRARY)
 			LIST(APPEND ${_out_compile_flags} "-fPIC")
 		ENDIF(${_targetType} STREQUAL SHARED_LIBRARY OR ${_targetType} STREQUAL MODULE_LIBRARY)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ENDIF(NOT MSVC)
 
 	GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
 	FOREACH(item ${DIRINC})
@@ -100,17 +96,13 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _inputcpp _output)
 		SET(pchsupport_compiler_cxx_arg1 "")
 	ENDIF(CMAKE_CXX_COMPILER_ARG1)
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(${out_command}
-			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input}
-			)
-	ELSE(CMAKE_COMPILER_IS_GNUCXX)
+	IF(MSVC)
 		_PCH_GET_PDB_FILENAME(PDB_FILE ${_PCH_current_target})
-		SET(${out_command}
-			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	/Yc  /Fp\"${_output}\" ${_inputcpp} /c /Fd\"${PDB_FILE}\"
-			)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-ENDMACRO(_PCH_GET_COMPILE_COMMAND )
+		SET(${out_command} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	/Yc  /Fp\"${_output}\" ${_inputcpp} /c /Fd\"${PDB_FILE}\")
+	ELSE(MSVC)
+		SET(${out_command} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input})
+	ENDIF(MSVC)
+ENDMACRO(_PCH_GET_COMPILE_COMMAND)
 
 MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
 	IF(MSVC)
@@ -128,7 +120,9 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 		SET(oldProps "")
 	ENDIF(${oldProps} MATCHES NOTFOUND)
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
+	IF(MSVC)
+		SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")
+	ELSE(MSVC)
 		# to do: test whether compiler flags match between target  _targetName
 		# and _pch_output_to_use
 		FILE(TO_NATIVE_PATH ${_pch_output_to_use} _native_pch_path)
@@ -137,11 +131,7 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 		# on all remote machines set
 		# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
 		SET(_target_cflags "${oldProps} ${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${_input} -Winvalid-pch")
-	ELSE(CMAKE_COMPILER_IS_GNUCXX)
-		IF(MSVC)
-			SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")
-		ENDIF(MSVC)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ENDIF(MSVC)
 
 	SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS ${_target_cflags})
 	IF(oldProps)
@@ -184,8 +174,31 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 	ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh} ${_output})
 ENDMACRO(ADD_PRECOMPILED_HEADER)
 
+# Macro to move PCH creation file to the front of files list
+MACRO(FIX_PRECOMPILED_HEADER _files _pch)
+	# Remove .cpp creating PCH from the list
+	LIST(REMOVE_ITEM ${_files} ${_pch})
+	# Prepend .cpp creating PCH to the list
+	LIST(INSERT ${_files} 0 ${_pch})
+ENDMACRO(FIX_PRECOMPILED_HEADER)
+
 MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
-	IF(CMAKE_GENERATOR MATCHES Visual*)
+	SET(PCH_METHOD 0)
+
+	# 0 => creating a new target for PCH, works for all makefiles
+	# 1 => setting PCH for VC++ project, works for VC++ projects
+	# 2 => setting PCH for XCode project, works for XCode projects
+	IF(CMAKE_GENERATOR MATCHES "Visual Studio")
+		SET(PCH_METHOD 1)
+	ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles" AND MFC_FOUND AND CMAKE_MFC_FLAG)
+		# To fix a bug with MFC
+		# Don't forget to use FIX_PRECOMPILED_HEADER before creating the target
+#		SET(PCH_METHOD 1)
+	ELSEIF(CMAKE_GENERATOR MATCHES "Xcode")
+		SET(PCH_METHOD 2)
+	ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio")
+
+	IF(PCH_METHOD EQUAL 1)
 		# Auto include the precompile (useful for moc processing, since the use of
 		# precompiled is specified at the target level
 		# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
@@ -200,26 +213,24 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
 		#also inlude ${oldProps} to have the same compile options
 		SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
-	ELSE(CMAKE_GENERATOR MATCHES Visual*)
-		IF(CMAKE_GENERATOR MATCHES Xcode)
-			# For Xcode, cmake needs my patch to process
-			# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
+	ELSEIF(PCH_METHOD EQUAL 2)
+		# For Xcode, cmake needs my patch to process
+		# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
 
-			GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
-			IF(${oldProps} MATCHES NOTFOUND)
-				SET(oldProps "")
-			ENDIF(${oldProps} MATCHES NOTFOUND)
+		GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
+		IF(${oldProps} MATCHES NOTFOUND)
+			SET(oldProps "")
+		ENDIF(${oldProps} MATCHES NOTFOUND)
 
-			# When buiding out of the tree, precompiled may not be located
-			# Use full path instead.
-			GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
+		# When buiding out of the tree, precompiled may not be located
+		# Use full path instead.
+		GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
 
-			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
-			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
-		ELSE(CMAKE_GENERATOR MATCHES Xcode)
-			#Fallback to the "old" precompiled suppport
-			ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
-		ENDIF(CMAKE_GENERATOR MATCHES Xcode)
-	ENDIF(CMAKE_GENERATOR MATCHES Visual*)
+		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
+		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+	ELSE(PCH_METHOD EQUAL 1)
+		#Fallback to the "old" precompiled suppport
+		ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
+	ENDIF(PCH_METHOD EQUAL 1)
 
 ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 7dd43e8b4..bd92e743e 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -9,6 +9,33 @@ MACRO(NL_GEN_PC name)
   ENDIF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
 ENDMACRO(NL_GEN_PC)
 
+###
+# Helper macro that generates revision.h from revision.h.in
+###
+MACRO(NL_GEN_REVISION_H)
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+    ADD_DEFINITIONS(-DHAVE_REVISION_H)
+    SET(HAVE_REVISION_H ON)
+
+    # a custom target that is always built
+    ADD_CUSTOM_TARGET(revision ALL
+      DEPENDS ${CMAKE_BINARY_DIR}/revision.h)
+
+    # creates revision.h using cmake script
+    ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/revision.h
+      COMMAND ${CMAKE_COMMAND}
+      -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+      -DROOT_DIR=${CMAKE_SOURCE_DIR}/..
+      -P ${CMAKE_SOURCE_DIR}/CMakeModules/GetRevision.cmake)
+
+    # revision.h is a generated file
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/revision.h
+      PROPERTIES GENERATED TRUE
+      HEADER_FILE_ONLY TRUE)
+  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
+ENDMACRO(NL_GEN_REVISION_H)
+
 ###
 #
 ###
@@ -613,13 +640,19 @@ MACRO(SETUP_EXTERNAL)
       ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
     ENDIF(MSVC10)
   ELSE(WIN32)
-    IF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
+    IF(APPLE)
       IF(WITH_STATIC_EXTERNAL)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .dylib .so)
       ELSE(WITH_STATIC_EXTERNAL)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
       ENDIF(WITH_STATIC_EXTERNAL)
-    ENDIF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
+    ELSE(APPLE)
+      IF(WITH_STATIC_EXTERNAL)
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
+      ELSE(WITH_STATIC_EXTERNAL)
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .so .a)
+      ENDIF(WITH_STATIC_EXTERNAL)
+    ENDIF(APPLE)
   ENDIF(WIN32)
 
   IF(WITH_STLPORT)
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
index 68e28429d..d82cdb63b 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
@@ -78,6 +78,18 @@ Core::IContext *ContextManager::context(const QString &id) const
 	return 0;
 }
 
+void ContextManager::registerUndoStack(QUndoStack *stack)
+{
+	nlassert(stack);
+	d->m_mainWindow->undoGroup()->addStack(stack);
+}
+
+void ContextManager::unregisterUndoStack(QUndoStack *stack)
+{
+	nlassert(stack);
+	d->m_mainWindow->undoGroup()->removeStack(stack);
+}
+
 void ContextManager::activateContext(const QString &id)
 {
 	const int index = indexOf(id);
@@ -85,6 +97,11 @@ void ContextManager::activateContext(const QString &id)
 		d->m_tabWidget->setCurrentIndex(index);
 }
 
+void ContextManager::updateCurrentContext()
+{
+	d->m_mainWindow->updateContext(currentContext());
+}
+
 void ContextManager::objectAdded(QObject *obj)
 {
 	IContext *context = qobject_cast<IContext *>(obj);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
index 7a3658fff..8151648e7 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
@@ -26,6 +26,7 @@
 
 QT_BEGIN_NAMESPACE
 class QTabWidget;
+class QUndoStack;
 QT_END_NAMESPACE
 
 namespace Core
@@ -45,12 +46,17 @@ public:
 	Core::IContext *currentContext() const;
 	Core::IContext *context(const QString &id) const;
 
+	// temporary solution for multiple undo stacks per context
+	void registerUndoStack(QUndoStack *stack);
+	void unregisterUndoStack(QUndoStack *stack);
+
 Q_SIGNALS:
 	// the default argument '=0' is important for connects without the oldContext argument.
 	void currentContextChanged(Core::IContext *context, Core::IContext *oldContext = 0);
 
 public Q_SLOTS:
 	void activateContext(const QString &id);
+	void updateCurrentContext();
 
 private Q_SLOTS:
 	void objectAdded(QObject *obj);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
index 6eb7d41f4..18f3690a0 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
@@ -92,7 +92,7 @@ const char *const SEARCH_PATHS = "SearchPaths";
 const char *const RECURSIVE_SEARCH_PATHS = "RecursiveSearchPathes";
 const char *const LEVELDESIGN_PATH = "LevelDesignPath";
 const char *const PRIMITIVES_PATH = "PrimitivesPath";
-const char * const ASSETS_PATH = "AssetsPath";
+const char *const ASSETS_PATH = "AssetsPath";
 const char *const LIGOCONFIG_FILE = "LigoConfigFile";
 const char *const REMAP_EXTENSIONS = "RemapExtensions";
 
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
index f00075b21..6e409e75d 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
@@ -128,6 +128,11 @@ QSettings *MainWindow::settings() const
 	return m_settings;
 }
 
+QUndoGroup *MainWindow::undoGroup() const
+{
+	return m_undoGroup;
+}
+
 ExtensionSystem::IPluginManager *MainWindow::pluginManager() const
 {
 	return m_pluginManager;
@@ -135,12 +140,16 @@ ExtensionSystem::IPluginManager *MainWindow::pluginManager() const
 
 void MainWindow::addContextObject(IContext *context)
 {
-	m_undoGroup->addStack(context->undoStack());
+	QUndoStack *stack = context->undoStack();
+	if (stack)
+		m_undoGroup->addStack(stack);
 }
 
 void MainWindow::removeContextObject(IContext *context)
 {
-	m_undoGroup->removeStack(context->undoStack());
+	QUndoStack *stack = context->undoStack();
+	if (stack)
+		m_undoGroup->removeStack(stack);
 }
 
 void MainWindow::open()
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
index ae0d0522c..a75126823 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
@@ -52,6 +52,7 @@ public:
 	MenuManager *menuManager() const;
 	ContextManager *contextManager() const;
 	QSettings *settings() const;
+	QUndoGroup *undoGroup() const;
 
 	ExtensionSystem::IPluginManager *pluginManager() const;
 
@@ -62,6 +63,7 @@ public Q_SLOTS:
 	bool showOptionsDialog(const QString &group = QString(),
 						   const QString &page = QString(),
 						   QWidget *parent = 0);
+	void updateContext(Core::IContext *context);
 
 private Q_SLOTS:
 	void open();
@@ -77,7 +79,6 @@ private Q_SLOTS:
 	void gotoPos();
 	void setFullScreen(bool enabled);
 	void about();
-	void updateContext(Core::IContext *context);
 
 protected:
 	virtual void closeEvent(QCloseEvent *event);
diff --git a/code/revision.h.in b/code/revision.h.in
new file mode 100644
index 000000000..6c5e9b8b1
--- /dev/null
+++ b/code/revision.h.in
@@ -0,0 +1,7 @@
+#ifndef REVISION_H
+#define REVISION_H
+
+#cmakedefine REVISION "${REVISION}"
+#cmakedefine BUILD_DATE "${BUILD_DATE}"
+
+#endif
diff --git a/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps b/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps
new file mode 100644
index 000000000..cf6a508a9
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape
new file mode 100644
index 000000000..713018df8
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape
new file mode 100644
index 000000000..b3fb8f6ca
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape
new file mode 100644
index 000000000..c72f5304e
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape b/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape
new file mode 100644
index 000000000..147ff3abb
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape b/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape
new file mode 100644
index 000000000..4a3eea639
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga b/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga
new file mode 100644
index 000000000..b8e05a831
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga
new file mode 100644
index 000000000..026711a84
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga
new file mode 100644
index 000000000..83f18a9b3
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds b/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds
new file mode 100644
index 000000000..03f9e0442
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds differ
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt
new file mode 100644
index 000000000..11fb51519
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt
@@ -0,0 +1,1145 @@
+r2ed_create_location.tga 0.000000000000 0.000000000000 0.195312500000 0.195312500000
+w_radar.tga 0.195312500000 0.000000000000 0.320312500000 0.125000000000
+skin_blank.tga 0.320312500000 0.000000000000 0.445312500000 0.125000000000
+skin_l1_blank.tga 0.195312500000 0.125000000000 0.320312500000 0.250000000000
+skin_header_m.tga 0.000000000000 0.250000000000 0.250000000000 0.281250000000
+r2ed_spring.tga 0.320312500000 0.125000000000 0.398437500000 0.203125000000
+r2ed_fall.tga 0.398437500000 0.125000000000 0.476562500000 0.203125000000
+r2ed_summer.tga 0.320312500000 0.203125000000 0.398437500000 0.281250000000
+r2ed_winter.tga 0.398437500000 0.203125000000 0.476562500000 0.281250000000
+r2_forest_back.tga 0.250000000000 0.250000000000 0.312500000000 0.312500000000
+r2_lakes_back.tga 0.000000000000 0.281250000000 0.062500000000 0.343750000000
+r2ed_previousLocations.tga 0.062500000000 0.281250000000 0.125000000000 0.343750000000
+r2ed_newLocation.tga 0.125000000000 0.281250000000 0.187500000000 0.343750000000
+r2ed_strictRules.tga 0.187500000000 0.281250000000 0.250000000000 0.343750000000
+r2ed_liberalRules.tga 0.312500000000 0.281250000000 0.375000000000 0.343750000000
+r2_jungle_back.tga 0.375000000000 0.281250000000 0.437500000000 0.343750000000
+r2_roots_back.tga 0.437500000000 0.281250000000 0.500000000000 0.343750000000
+r2_desert_back.tga 0.250000000000 0.312500000000 0.312500000000 0.375000000000
+r2_map_edge_arrow.tga 0.000000000000 0.375000000000 0.500000000000 0.381835937500
+W_slot_jauge_3.tga 0.000000000000 0.195312500000 0.123046875000 0.220703125000
+bulle_ia.tga 0.125000000000 0.195312500000 0.187500000000 0.242187500000
+jauge.tga 0.000000000000 0.343750000000 0.152343750000 0.359375000000
+slot_jauge.tga 0.312500000000 0.343750000000 0.464843750000 0.359375000000
+w_slot_categorie.tga 0.445312500000 0.000000000000 0.492187500000 0.046875000000
+w_slot_icon.tga 0.445312500000 0.046875000000 0.492187500000 0.093750000000
+r2_main_menu_full.tga 0.152343750000 0.343750000000 0.218750000000 0.375000000000
+r2_main_menu_full_over.tga 0.000000000000 0.382812500000 0.066406250000 0.414062500000
+r2_main_menu_full_pushed.tga 0.066406250000 0.382812500000 0.132812500000 0.414062500000
+item_selection.tga 0.132812500000 0.382812500000 0.177734375000 0.427734375000
+skin_m_open.tga 0.476562500000 0.093750000000 0.492187500000 0.218750000000
+jauge_action.tga 0.000000000000 0.222656250000 0.089843750000 0.242187500000
+slot_jauge_action.tga 0.179687500000 0.382812500000 0.269531250000 0.402343750000
+W_slot_item_selected.tga 0.269531250000 0.382812500000 0.310546875000 0.423828125000
+W_slot_item.tga 0.312500000000 0.382812500000 0.353515625000 0.423828125000
+r2ed_tool_draw_road_pushed.tga 0.355468750000 0.382812500000 0.398437500000 0.420898437500
+r2ed_tool_freeze_object.tga 0.398437500000 0.382812500000 0.441406250000 0.420898437500
+r2ed_tool_freeze_object_over.tga 0.441406250000 0.382812500000 0.484375000000 0.420898437500
+r2ed_tool_freeze_object_pushed.tga 0.179687500000 0.402343750000 0.222656250000 0.440429687500
+r2ed_tool_go_test.tga 0.222656250000 0.402343750000 0.265625000000 0.440429687500
+r2ed_tool_go_test_over.tga 0.000000000000 0.414062500000 0.042968750000 0.452148437500
+r2ed_tool_go_test_pushed.tga 0.042968750000 0.414062500000 0.085937500000 0.452148437500
+r2ed_tool_map_window.tga 0.085937500000 0.414062500000 0.128906250000 0.452148437500
+r2ed_tool_map_window_over.tga 0.355468750000 0.421875000000 0.398437500000 0.459960937500
+r2ed_tool_map_window_pushed.tga 0.398437500000 0.421875000000 0.441406250000 0.459960937500
+r2ed_tool_palette_window_over.tga 0.441406250000 0.421875000000 0.484375000000 0.459960937500
+r2ed_tool_palette_window_pushed.tga 0.265625000000 0.425781250000 0.308593750000 0.463867187500
+r2ed_tool_paste.tga 0.308593750000 0.425781250000 0.351562500000 0.463867187500
+r2ed_tool_paste_over.tga 0.128906250000 0.429687500000 0.171875000000 0.467773437500
+r2ed_tool_paste_pushed.tga 0.171875000000 0.441406250000 0.214843750000 0.479492187500
+r2ed_tool_pick.tga 0.214843750000 0.441406250000 0.257812500000 0.479492187500
+r2ed_tool_prim_display_mode.tga 0.000000000000 0.453125000000 0.042968750000 0.491210937500
+r2ed_tool_prim_display_mode_over.tga 0.042968750000 0.453125000000 0.085937500000 0.491210937500
+r2ed_tool_prim_display_mode_pushed.tga 0.085937500000 0.453125000000 0.128906250000 0.491210937500
+r2ed_tool_redo.tga 0.351562500000 0.460937500000 0.394531250000 0.499023437500
+r2ed_tool_redo_disabled.tga 0.394531250000 0.460937500000 0.437500000000 0.499023437500
+r2ed_tool_redo_over.tga 0.437500000000 0.460937500000 0.480468750000 0.499023437500
+r2ed_tool_redo_pushed.tga 0.492187500000 0.000000000000 0.535156250000 0.038085937500
+r2ed_tool_rotate.tga 0.535156250000 0.000000000000 0.578125000000 0.038085937500
+r2ed_tool_rotate_pushed.tga 0.578125000000 0.000000000000 0.621093750000 0.038085937500
+r2ed_tool_rotating.tga 0.621093750000 0.000000000000 0.664062500000 0.038085937500
+r2ed_tool_scenario_window.tga 0.664062500000 0.000000000000 0.707031250000 0.038085937500
+r2ed_tool_scenario_window_over.tga 0.707031250000 0.000000000000 0.750000000000 0.038085937500
+r2ed_tool_scenario_window_pushed.tga 0.750000000000 0.000000000000 0.792968750000 0.038085937500
+r2ed_tool_select.tga 0.792968750000 0.000000000000 0.835937500000 0.038085937500
+r2ed_tool_select_move.tga 0.835937500000 0.000000000000 0.878906250000 0.038085937500
+r2ed_tool_select_move_over.tga 0.878906250000 0.000000000000 0.921875000000 0.038085937500
+r2ed_tool_select_move_pushed.tga 0.921875000000 0.000000000000 0.964843750000 0.038085937500
+r2ed_tool_select_over.tga 0.492187500000 0.039062500000 0.535156250000 0.077148437500
+r2ed_tool_select_pushed.tga 0.535156250000 0.039062500000 0.578125000000 0.077148437500
+r2ed_tool_start.tga 0.578125000000 0.039062500000 0.621093750000 0.077148437500
+r2ed_tool_start_over.tga 0.621093750000 0.039062500000 0.664062500000 0.077148437500
+r2ed_tool_start_pushed.tga 0.664062500000 0.039062500000 0.707031250000 0.077148437500
+r2ed_tool_stop_over.tga 0.707031250000 0.039062500000 0.750000000000 0.077148437500
+r2ed_tool_stop_pushed.tga 0.750000000000 0.039062500000 0.792968750000 0.077148437500
+r2ed_tool_teleport.tga 0.792968750000 0.039062500000 0.835937500000 0.077148437500
+r2ed_tool_teleport_over.tga 0.835937500000 0.039062500000 0.878906250000 0.077148437500
+r2ed_tool_teleport_pushed.tga 0.878906250000 0.039062500000 0.921875000000 0.077148437500
+r2ed_tool_undo.tga 0.921875000000 0.039062500000 0.964843750000 0.077148437500
+r2ed_tool_undo_disabled.tga 0.492187500000 0.078125000000 0.535156250000 0.116210937500
+r2ed_tool_undo_over.tga 0.535156250000 0.078125000000 0.578125000000 0.116210937500
+r2ed_tool_undo_pushed.tga 0.578125000000 0.078125000000 0.621093750000 0.116210937500
+r2ed_tool_unfreeze_object.tga 0.621093750000 0.078125000000 0.664062500000 0.116210937500
+r2ed_tool_unfreeze_object_over.tga 0.664062500000 0.078125000000 0.707031250000 0.116210937500
+r2ed_tool_unfreeze_object_pushed.tga 0.707031250000 0.078125000000 0.750000000000 0.116210937500
+curs_scale.tga 0.750000000000 0.078125000000 0.792968750000 0.116210937500
+curs_stop.tga 0.792968750000 0.078125000000 0.835937500000 0.116210937500
+r2ed_feature_kitins_lair.tga 0.835937500000 0.078125000000 0.878906250000 0.116210937500
+r2ed_feature_kitins_lair_over.tga 0.878906250000 0.078125000000 0.921875000000 0.116210937500
+r2ed_tool_can_pick.tga 0.921875000000 0.078125000000 0.964843750000 0.116210937500
+r2ed_tool_can_rotate.tga 0.492187500000 0.117187500000 0.535156250000 0.155273437500
+r2ed_tool_can_rotate_over.tga 0.535156250000 0.117187500000 0.578125000000 0.155273437500
+r2ed_tool_can_rotate_pushed.tga 0.578125000000 0.117187500000 0.621093750000 0.155273437500
+r2ed_tool_copy.tga 0.621093750000 0.117187500000 0.664062500000 0.155273437500
+r2ed_tool_copy_over.tga 0.664062500000 0.117187500000 0.707031250000 0.155273437500
+r2ed_tool_copy_pushed.tga 0.707031250000 0.117187500000 0.750000000000 0.155273437500
+r2ed_tool_display_mode.tga 0.750000000000 0.117187500000 0.792968750000 0.155273437500
+r2ed_tool_display_mode_over.tga 0.792968750000 0.117187500000 0.835937500000 0.155273437500
+r2ed_tool_display_mode_pushed.tga 0.835937500000 0.117187500000 0.878906250000 0.155273437500
+r2_hand_can_pan.tga 0.878906250000 0.117187500000 0.921875000000 0.155273437500
+r2_hand_pan.tga 0.921875000000 0.117187500000 0.964843750000 0.155273437500
+r2_icon_dm_mode.tga 0.492187500000 0.156250000000 0.535156250000 0.194335937500
+r2_icon_dm_mode_over.tga 0.535156250000 0.156250000000 0.578125000000 0.194335937500
+r2ed_feature_kitins_lair_pushed.tga 0.578125000000 0.156250000000 0.621093750000 0.194335937500
+r2_stop_live_pushed.tga 0.621093750000 0.156250000000 0.664062500000 0.194335937500
+curs_create.tga 0.664062500000 0.156250000000 0.707031250000 0.194335937500
+curs_create_multi.tga 0.707031250000 0.156250000000 0.750000000000 0.194335937500
+curs_create_vertex_invalid.tga 0.750000000000 0.156250000000 0.792968750000 0.194335937500
+curs_default.tga 0.792968750000 0.156250000000 0.835937500000 0.194335937500
+curs_dup.tga 0.835937500000 0.156250000000 0.878906250000 0.194335937500
+curs_pan.tga 0.878906250000 0.156250000000 0.921875000000 0.194335937500
+curs_pan_dup.tga 0.921875000000 0.156250000000 0.964843750000 0.194335937500
+curs_pick.tga 0.492187500000 0.195312500000 0.535156250000 0.233398437500
+curs_pick_dup.tga 0.535156250000 0.195312500000 0.578125000000 0.233398437500
+curs_resize_bl_tr.tga 0.578125000000 0.195312500000 0.621093750000 0.233398437500
+curs_resize_br_tl.tga 0.621093750000 0.195312500000 0.664062500000 0.233398437500
+curs_resize_lr.tga 0.664062500000 0.195312500000 0.707031250000 0.233398437500
+curs_resize_tb.tga 0.707031250000 0.195312500000 0.750000000000 0.233398437500
+r2_player_admin.tga 0.750000000000 0.195312500000 0.792968750000 0.233398437500
+r2_player_admin_over.tga 0.792968750000 0.195312500000 0.835937500000 0.233398437500
+r2_player_admin_pushed.tga 0.835937500000 0.195312500000 0.878906250000 0.233398437500
+r2ed_feature_loot_spawner.tga 0.878906250000 0.195312500000 0.921875000000 0.233398437500
+r2_scenario_admin.tga 0.921875000000 0.195312500000 0.964843750000 0.233398437500
+r2_scenario_admin_over.tga 0.476562500000 0.234375000000 0.519531250000 0.272460937500
+r2_scenario_admin_pushed.tga 0.519531250000 0.234375000000 0.562500000000 0.272460937500
+r2ed_feature_loot_spawner_over.tga 0.562500000000 0.234375000000 0.605468750000 0.272460937500
+r2ed_feature_loot_spawner_pushed.tga 0.605468750000 0.234375000000 0.648437500000 0.272460937500
+r2ed_feature_timer.tga 0.648437500000 0.234375000000 0.691406250000 0.272460937500
+r2ed_feature_timer_over.tga 0.691406250000 0.234375000000 0.734375000000 0.272460937500
+r2ed_feature_timer_pushed.tga 0.734375000000 0.234375000000 0.777343750000 0.272460937500
+r2ed_tool_stop.tga 0.777343750000 0.234375000000 0.820312500000 0.272460937500
+r2ed_feature_fauna_pushed.tga 0.820312500000 0.234375000000 0.863281250000 0.272460937500
+r2ed_feature_fauna_system.tga 0.863281250000 0.234375000000 0.906250000000 0.272460937500
+curs_can_pan.tga 0.906250000000 0.234375000000 0.949218750000 0.272460937500
+r2ed_feature_fauna_system_over.tga 0.949218750000 0.234375000000 0.992187500000 0.272460937500
+r2_icon_dm_mode_pushed.tga 0.500000000000 0.273437500000 0.542968750000 0.311523437500
+curs_can_pan_dup.tga 0.542968750000 0.273437500000 0.585937500000 0.311523437500
+r2_stop_live_over.tga 0.585937500000 0.273437500000 0.628906250000 0.311523437500
+curs_rotate.tga 0.628906250000 0.273437500000 0.671875000000 0.311523437500
+r2ed_feature_fauna_over.tga 0.671875000000 0.273437500000 0.714843750000 0.311523437500
+r2ed_feature_fauna_system_pushed.tga 0.714843750000 0.273437500000 0.757812500000 0.311523437500
+r2ed_feature_bandit_camp.tga 0.757812500000 0.273437500000 0.800781250000 0.311523437500
+r2ed_feature_bandit_camp_over.tga 0.800781250000 0.273437500000 0.843750000000 0.311523437500
+r2ed_feature_bandit_camp_pushed.tga 0.843750000000 0.273437500000 0.886718750000 0.311523437500
+r2ed_feature_fauna.tga 0.886718750000 0.273437500000 0.929687500000 0.311523437500
+r2ed_tool_draw_region.tga 0.929687500000 0.273437500000 0.972656250000 0.311523437500
+r2_stop_live.tga 0.500000000000 0.312500000000 0.542968750000 0.350585937500
+r2ed_create_dialog.tga 0.542968750000 0.312500000000 0.585937500000 0.350585937500
+r2ed_create_dialog_over.tga 0.585937500000 0.312500000000 0.628906250000 0.350585937500
+r2ed_create_dialog_pushed.tga 0.628906250000 0.312500000000 0.671875000000 0.350585937500
+r2ed_tool_palette_window.tga 0.671875000000 0.312500000000 0.714843750000 0.350585937500
+r2ed_tool_rotate_over.tga 0.714843750000 0.312500000000 0.757812500000 0.350585937500
+r2ed_tool_draw_region_over.tga 0.757812500000 0.312500000000 0.800781250000 0.350585937500
+r2ed_tool_draw_region_pushed.tga 0.800781250000 0.312500000000 0.843750000000 0.350585937500
+r2ed_tool_draw_road.tga 0.843750000000 0.312500000000 0.886718750000 0.350585937500
+r2ed_tool_draw_road_over.tga 0.886718750000 0.312500000000 0.929687500000 0.350585937500
+w_ar_gilet.tga 0.929687500000 0.312500000000 0.968750000000 0.351562500000
+w_ar_hand.tga 0.500000000000 0.351562500000 0.539062500000 0.390625000000
+w_ar_helmet.tga 0.539062500000 0.351562500000 0.578125000000 0.390625000000
+hand_left.tga 0.578125000000 0.351562500000 0.617187500000 0.390625000000
+hand_right.tga 0.617187500000 0.351562500000 0.656250000000 0.390625000000
+sapload.tga 0.656250000000 0.351562500000 0.695312500000 0.390625000000
+w_ar_pantabotte.tga 0.695312500000 0.351562500000 0.734375000000 0.390625000000
+w_ar_armpad.tga 0.734375000000 0.351562500000 0.773437500000 0.390625000000
+w_ar_botte.tga 0.773437500000 0.351562500000 0.812500000000 0.390625000000
+skin_l2.tga 0.992187500000 0.000000000000 0.998046875000 0.250000000000
+r2_map_edge_stipple.tga 0.484375000000 0.390625000000 0.984375000000 0.393554687500
+r2_main_bl.tga 0.812500000000 0.351562500000 0.851562500000 0.383789062500
+W_slot_jauge_1.tga 0.851562500000 0.351562500000 0.974609375000 0.361328125000
+w_slot_blason.tga 0.484375000000 0.394531250000 0.517578125000 0.427734375000
+w_slot_blason_over.tga 0.519531250000 0.394531250000 0.552734375000 0.427734375000
+w_header_l.tga 0.851562500000 0.363281250000 0.898437500000 0.386718750000
+bg_source_mid.tga 0.000000000000 0.242187500000 0.148437500000 0.249023437500
+r2_icon_weather_pushed.tga 0.445312500000 0.093750000000 0.476562500000 0.125000000000
+Skin_scroll_H.tga 0.000000000000 0.359375000000 0.125000000000 0.367187500000
+skin_scroll_m.tga 0.964843750000 0.000000000000 0.972656250000 0.125000000000
+r2_toolbar_customize_look.tga 0.968750000000 0.312500000000 1.000000000000 0.343750000000
+r2_toolbar_customize_look_over.tga 0.218750000000 0.343750000000 0.250000000000 0.375000000000
+r2_toolbar_kill.tga 0.464843750000 0.343750000000 0.496093750000 0.375000000000
+r2_toolbar_kill_over.tga 0.554687500000 0.394531250000 0.585937500000 0.425781250000
+r2_toolbar_kill_pushed.tga 0.585937500000 0.394531250000 0.617187500000 0.425781250000
+r2_toolbar_patrol_road.tga 0.617187500000 0.394531250000 0.648437500000 0.425781250000
+r2_toolbar_patrol_road_over.tga 0.648437500000 0.394531250000 0.679687500000 0.425781250000
+r2_toolbar_patrol_road_pushed.tga 0.679687500000 0.394531250000 0.710937500000 0.425781250000
+r2_toolbar_properties.tga 0.710937500000 0.394531250000 0.742187500000 0.425781250000
+r2_toolbar_properties_over.tga 0.742187500000 0.394531250000 0.773437500000 0.425781250000
+r2_toolbar_properties_pushed.tga 0.773437500000 0.394531250000 0.804687500000 0.425781250000
+r2_toolbar_repeat_road.tga 0.804687500000 0.394531250000 0.835937500000 0.425781250000
+r2_toolbar_repeat_road_over.tga 0.835937500000 0.394531250000 0.867187500000 0.425781250000
+r2_toolbar_repeat_road_pushed.tga 0.867187500000 0.394531250000 0.898437500000 0.425781250000
+r2_toolbar_set_as_leader.tga 0.898437500000 0.394531250000 0.929687500000 0.425781250000
+r2_toolbar_set_as_leader_over.tga 0.929687500000 0.394531250000 0.960937500000 0.425781250000
+r2_toolbar_stand_still.tga 0.960937500000 0.394531250000 0.992187500000 0.425781250000
+r2_toolbar_stand_still_over.tga 0.554687500000 0.425781250000 0.585937500000 0.457031250000
+r2_toolbar_stand_still_pushed.tga 0.585937500000 0.425781250000 0.617187500000 0.457031250000
+r2_toolbar_ungroup.tga 0.617187500000 0.425781250000 0.648437500000 0.457031250000
+r2_toolbar_ungroup_over.tga 0.648437500000 0.425781250000 0.679687500000 0.457031250000
+r2_toolbar_ungroup_pushed.tga 0.679687500000 0.425781250000 0.710937500000 0.457031250000
+r2_toolbar_wander_zone.tga 0.710937500000 0.425781250000 0.742187500000 0.457031250000
+r2_toolbar_wander_zone_over.tga 0.742187500000 0.425781250000 0.773437500000 0.457031250000
+r2_toolbar_wander_zone_pushed.tga 0.773437500000 0.425781250000 0.804687500000 0.457031250000
+r2ed_toolbar_hunt_zone.tga 0.804687500000 0.425781250000 0.835937500000 0.457031250000
+r2ed_toolbar_hunt_zone_over.tga 0.835937500000 0.425781250000 0.867187500000 0.457031250000
+r2ed_toolbar_hunt_zone_pushed.tga 0.867187500000 0.425781250000 0.898437500000 0.457031250000
+r2ed_toolbar_lock.tga 0.898437500000 0.425781250000 0.929687500000 0.457031250000
+r2ed_toolbar_lock_over.tga 0.929687500000 0.425781250000 0.960937500000 0.457031250000
+curs_l.tga 0.960937500000 0.425781250000 0.992187500000 0.457031250000
+curs_L_no_mouse.tga 0.484375000000 0.429687500000 0.515625000000 0.460937500000
+r2ed_toolbar_lock_pushed.tga 0.515625000000 0.429687500000 0.546875000000 0.460937500000
+r2ed_toolbar_rest_zone.tga 0.546875000000 0.457031250000 0.578125000000 0.488281250000
+r2ed_toolbar_rest_zone_over.tga 0.578125000000 0.457031250000 0.609375000000 0.488281250000
+r2ed_toolbar_rest_zone_pushed.tga 0.609375000000 0.457031250000 0.640625000000 0.488281250000
+curs_r.tga 0.640625000000 0.457031250000 0.671875000000 0.488281250000
+r2ed_toolbar_show.tga 0.671875000000 0.457031250000 0.703125000000 0.488281250000
+r2ed_toolbar_show_over.tga 0.703125000000 0.457031250000 0.734375000000 0.488281250000
+r2ed_toolbar_show_pushed.tga 0.734375000000 0.457031250000 0.765625000000 0.488281250000
+r2ed_toolbar_unfreeze.tga 0.765625000000 0.457031250000 0.796875000000 0.488281250000
+r2ed_current_act_content_over.tga 0.796875000000 0.457031250000 0.828125000000 0.488281250000
+r2ed_current_act_content_pushed.tga 0.828125000000 0.457031250000 0.859375000000 0.488281250000
+r2ed_edit_dialog.tga 0.859375000000 0.457031250000 0.890625000000 0.488281250000
+r2ed_edit_dialog_over.tga 0.890625000000 0.457031250000 0.921875000000 0.488281250000
+r2ed_edit_dialog_pushed.tga 0.921875000000 0.457031250000 0.953125000000 0.488281250000
+r2_icon_possess.tga 0.953125000000 0.457031250000 0.984375000000 0.488281250000
+r2_icon_possess_over.tga 0.480468750000 0.460937500000 0.511718750000 0.492187500000
+r2_icon_possess_pushed.tga 0.511718750000 0.460937500000 0.542968750000 0.492187500000
+r2_icon_speak_as.tga 0.257812500000 0.464843750000 0.289062500000 0.496093750000
+r2_icon_speak_as_over.tga 0.289062500000 0.464843750000 0.320312500000 0.496093750000
+r2_icon_speak_as_pushed.tga 0.320312500000 0.464843750000 0.351562500000 0.496093750000
+r2ed_toolbar_unfreeze_over.tga 0.128906250000 0.468750000000 0.160156250000 0.500000000000
+r2ed_toolbar_unlock.tga 0.160156250000 0.480468750000 0.191406250000 0.511718750000
+r2ed_toolbar_unlock_over.tga 0.191406250000 0.480468750000 0.222656250000 0.511718750000
+r2ed_toolbar_unlock_pushed.tga 0.222656250000 0.480468750000 0.253906250000 0.511718750000
+r2_scenario.tga 0.542968750000 0.488281250000 0.574218750000 0.519531250000
+r2ed_toolbar_work_zone.tga 0.574218750000 0.488281250000 0.605468750000 0.519531250000
+r2ed_toolbar_work_zone_over.tga 0.605468750000 0.488281250000 0.636718750000 0.519531250000
+r2ed_toolbar_work_zone_pushed.tga 0.636718750000 0.488281250000 0.667968750000 0.519531250000
+r2ed_tool_new_vertex.tga 0.667968750000 0.488281250000 0.699218750000 0.519531250000
+r2ed_tool_new_vertex_over.tga 0.699218750000 0.488281250000 0.730468750000 0.519531250000
+ia_surpris.tga 0.730468750000 0.488281250000 0.761718750000 0.519531250000
+r2ed_tool_new_vertex_pushed.tga 0.761718750000 0.488281250000 0.792968750000 0.519531250000
+r2ed_permanent_content.tga 0.792968750000 0.488281250000 0.824218750000 0.519531250000
+r2ed_permanent_content_over.tga 0.824218750000 0.488281250000 0.855468750000 0.519531250000
+r2ed_toolbar_hide_pushed.tga 0.855468750000 0.488281250000 0.886718750000 0.519531250000
+r2ed_toolbar_unfreeze_pushed.tga 0.886718750000 0.488281250000 0.917968750000 0.519531250000
+r2ed_permanent_content_pushed.tga 0.917968750000 0.488281250000 0.949218750000 0.519531250000
+r2ed_current_act_content.tga 0.949218750000 0.488281250000 0.980468750000 0.519531250000
+skin_l.tga 0.972656250000 0.000000000000 0.980468750000 0.125000000000
+r2_frustum.tga 0.000000000000 0.492187500000 0.031250000000 0.523437500000
+r2ed_toolbar_feed_zone.tga 0.031250000000 0.492187500000 0.062500000000 0.523437500000
+r2ed_toolbar_feed_zone_over.tga 0.062500000000 0.492187500000 0.093750000000 0.523437500000
+r2ed_toolbar_feed_zone_pushed.tga 0.093750000000 0.492187500000 0.125000000000 0.523437500000
+r2ed_toolbar_freeze.tga 0.480468750000 0.492187500000 0.511718750000 0.523437500000
+r2ed_toolbar_freeze_over.tga 0.511718750000 0.492187500000 0.542968750000 0.523437500000
+r2ed_toolbar_freeze_pushed.tga 0.253906250000 0.496093750000 0.285156250000 0.527343750000
+r2ed_toolbar_guard_zone.tga 0.285156250000 0.496093750000 0.316406250000 0.527343750000
+r2ed_toolbar_guard_zone_over.tga 0.316406250000 0.496093750000 0.347656250000 0.527343750000
+r2ed_toolbar_guard_zone_pushed.tga 0.125000000000 0.500000000000 0.156250000000 0.531250000000
+r2ed_toolbar_hide.tga 0.347656250000 0.500000000000 0.378906250000 0.531250000000
+r2ed_toolbar_hide_over.tga 0.378906250000 0.500000000000 0.410156250000 0.531250000000
+r2ed_tool_extend_prim.tga 0.410156250000 0.500000000000 0.441406250000 0.531250000000
+r2ed_tool_extend_prim_over.tga 0.441406250000 0.500000000000 0.472656250000 0.531250000000
+r2_icon_acts.tga 0.156250000000 0.511718750000 0.187500000000 0.542968750000
+r2_icon_animation_triggers.tga 0.187500000000 0.511718750000 0.218750000000 0.542968750000
+r2_icon_acts_over.tga 0.218750000000 0.511718750000 0.250000000000 0.542968750000
+r2_icon_stop_acts.tga 0.542968750000 0.519531250000 0.574218750000 0.550781250000
+r2_icon_acts_pushed.tga 0.574218750000 0.519531250000 0.605468750000 0.550781250000
+r2_icon_add_hp.tga 0.605468750000 0.519531250000 0.636718750000 0.550781250000
+r2_toolbar_customize_look_pushed.tga 0.636718750000 0.519531250000 0.667968750000 0.550781250000
+r2_toolbar_group_pushed.tga 0.667968750000 0.519531250000 0.699218750000 0.550781250000
+r2_toolbar_set_as_leader_pushed.tga 0.699218750000 0.519531250000 0.730468750000 0.550781250000
+r2_icon_add_hp_over.tga 0.730468750000 0.519531250000 0.761718750000 0.550781250000
+r2_icon_add_hp_pushed.tga 0.761718750000 0.519531250000 0.792968750000 0.550781250000
+skin_b.tga 0.312500000000 0.359375000000 0.437500000000 0.367187500000
+r2_icon_animation_give.tga 0.792968750000 0.519531250000 0.824218750000 0.550781250000
+skin_b_open.tga 0.000000000000 0.367187500000 0.125000000000 0.375000000000
+skin_em_open.tga 0.312500000000 0.367187500000 0.437500000000 0.375000000000
+r2ed_edit_events.tga 0.824218750000 0.519531250000 0.855468750000 0.550781250000
+r2ed_edit_events_over.tga 0.855468750000 0.519531250000 0.886718750000 0.550781250000
+r2ed_edit_events_pushed.tga 0.886718750000 0.519531250000 0.917968750000 0.550781250000
+r2_icon_animation_give_over.tga 0.917968750000 0.519531250000 0.949218750000 0.550781250000
+r2_icon_animation_give_pushed.tga 0.949218750000 0.519531250000 0.980468750000 0.550781250000
+r2_icon_animation_target.tga 0.000000000000 0.523437500000 0.031250000000 0.554687500000
+r2_icon_animation_target_over.tga 0.031250000000 0.523437500000 0.062500000000 0.554687500000
+r2_icon_animation_target_pushed.tga 0.062500000000 0.523437500000 0.093750000000 0.554687500000
+r2ed_icon_stop.tga 0.093750000000 0.523437500000 0.125000000000 0.554687500000
+r2_icon_animation_triggers_over.tga 0.472656250000 0.523437500000 0.503906250000 0.554687500000
+r2_icon_animation_triggers_pushed.tga 0.503906250000 0.523437500000 0.535156250000 0.554687500000
+r2_icon_despawn.tga 0.250000000000 0.527343750000 0.281250000000 0.558593750000
+r2_icon_despawn_over.tga 0.281250000000 0.527343750000 0.312500000000 0.558593750000
+r2_icon_despawn_pushed.tga 0.312500000000 0.527343750000 0.343750000000 0.558593750000
+r2ed_tool_extend_prim_pushed.tga 0.125000000000 0.531250000000 0.156250000000 0.562500000000
+r2_toolbar_customize_over.tga 0.343750000000 0.531250000000 0.375000000000 0.562500000000
+r2_toolbar_customize_pushed.tga 0.375000000000 0.531250000000 0.406250000000 0.562500000000
+r2_toolbar_delete.tga 0.406250000000 0.531250000000 0.437500000000 0.562500000000
+r2_toolbar_delete_over.tga 0.437500000000 0.531250000000 0.468750000000 0.562500000000
+r2_toolbar_delete_pushed.tga 0.156250000000 0.542968750000 0.187500000000 0.574218750000
+r2_toolbar_follow_road.tga 0.187500000000 0.542968750000 0.218750000000 0.574218750000
+r2_toolbar_follow_road_over.tga 0.218750000000 0.542968750000 0.250000000000 0.574218750000
+r2_toolbar_follow_road_pushed.tga 0.535156250000 0.550781250000 0.566406250000 0.582031250000
+r2_toolbar_group.tga 0.566406250000 0.550781250000 0.597656250000 0.582031250000
+r2_toolbar_group_over.tga 0.597656250000 0.550781250000 0.628906250000 0.582031250000
+skin_r.tga 0.980468750000 0.000000000000 0.988281250000 0.125000000000
+r2_icon_stop_acts_over.tga 0.628906250000 0.550781250000 0.660156250000 0.582031250000
+r2_icon_stop_acts_pushed.tga 0.660156250000 0.550781250000 0.691406250000 0.582031250000
+r2_icon_stop_possess.tga 0.691406250000 0.550781250000 0.722656250000 0.582031250000
+r2_icon_stop_possess_over.tga 0.722656250000 0.550781250000 0.753906250000 0.582031250000
+r2_icon_stop_possess_pushed.tga 0.753906250000 0.550781250000 0.785156250000 0.582031250000
+r2_icon_stop_speak.tga 0.785156250000 0.550781250000 0.816406250000 0.582031250000
+r2_icon_stop_speak_over.tga 0.816406250000 0.550781250000 0.847656250000 0.582031250000
+building_state1.tga 0.847656250000 0.550781250000 0.878906250000 0.582031250000
+building_state2.tga 0.878906250000 0.550781250000 0.910156250000 0.582031250000
+r2_icon_stop_speak_pushed.tga 0.910156250000 0.550781250000 0.941406250000 0.582031250000
+skin_t.tga 0.000000000000 0.554687500000 0.125000000000 0.562500000000
+r2_icon_test_mode.tga 0.941406250000 0.550781250000 0.972656250000 0.582031250000
+r2_icon_test_mode_over.tga 0.468750000000 0.554687500000 0.500000000000 0.585937500000
+r2_icon_test_mode_pushed.tga 0.500000000000 0.554687500000 0.531250000000 0.585937500000
+r2_icon_weather.tga 0.250000000000 0.558593750000 0.281250000000 0.589843750000
+r2_allow.tga 0.281250000000 0.558593750000 0.312500000000 0.589843750000
+r2_icon_weather_over.tga 0.312500000000 0.558593750000 0.343750000000 0.589843750000
+r2ed_storm.tga 0.898437500000 0.363281250000 0.937500000000 0.386718750000
+r2ed_clouds.tga 0.937500000000 0.363281250000 0.976562500000 0.386718750000
+bg_jauge_mid.tga 0.000000000000 0.562500000000 0.125000000000 0.569335937500
+r2ed_lakes_l.tga 0.964843750000 0.125000000000 0.992187500000 0.156250000000
+r2ed_lakes_pushed_l.tga 0.964843750000 0.156250000000 0.992187500000 0.187500000000
+r2ed_jungle_l.tga 0.964843750000 0.187500000000 0.991210937500 0.218750000000
+r2ed_jungle_pushed_l.tga 0.972656250000 0.273437500000 0.999023437500 0.304687500000
+skin_header_r.tga 0.972656250000 0.550781250000 0.998046875000 0.582031250000
+r2ed_prime_roots_l.tga 0.125000000000 0.562500000000 0.150390625000 0.593750000000
+r2ed_desert_l.tga 0.343750000000 0.562500000000 0.369140625000 0.593750000000
+r2ed_desert_pushed_l.tga 0.371093750000 0.562500000000 0.396484375000 0.593750000000
+r2ed_prime_roots_pushed_l.tga 0.398437500000 0.562500000000 0.423828125000 0.593750000000
+W_trade_not_ready.tga 0.425781250000 0.562500000000 0.464843750000 0.582031250000
+slot_brick.tga 0.000000000000 0.570312500000 0.027343750000 0.597656250000
+disconnect.tga 0.027343750000 0.570312500000 0.054687500000 0.597656250000
+W_button_28_over.tga 0.054687500000 0.570312500000 0.082031250000 0.597656250000
+w_button_mode_over2.tga 0.082031250000 0.570312500000 0.109375000000 0.597656250000
+r2_tab_sequence_pushed_l.tga 0.152343750000 0.574218750000 0.179687500000 0.601562500000
+r2_tab_wide_normal_l.tga 0.179687500000 0.574218750000 0.207031250000 0.601562500000
+r2_tab_wide_pushed_l.tga 0.207031250000 0.574218750000 0.234375000000 0.601562500000
+action_balance_cred.tga 0.425781250000 0.582031250000 0.457031250000 0.605468750000
+bulle_say_l.tga 0.531250000000 0.582031250000 0.562500000000 0.605468750000
+bulle_say_r.tga 0.562500000000 0.582031250000 0.593750000000 0.605468750000
+bulle_say_tl.tga 0.593750000000 0.582031250000 0.625000000000 0.605468750000
+bulle_say_tr.tga 0.625000000000 0.582031250000 0.656250000000 0.605468750000
+bulle_think_l.tga 0.656250000000 0.582031250000 0.687500000000 0.605468750000
+bulle_think_r.tga 0.687500000000 0.582031250000 0.718750000000 0.605468750000
+W_slot_jauge_3_mini.tga 0.718750000000 0.582031250000 0.781250000000 0.593750000000
+action_balance_equal.tga 0.781250000000 0.582031250000 0.812500000000 0.605468750000
+action_balance_cost.tga 0.812500000000 0.582031250000 0.843750000000 0.605468750000
+skill_arbo_x_extend.tga 0.976562500000 0.343750000000 1.000000000000 0.375000000000
+bg_source_bot.tga 0.843750000000 0.582031250000 0.992187500000 0.586914062500
+w_slot_jauge_1_tmin.tga 0.457031250000 0.585937500000 0.515625000000 0.597656250000
+r2_main_menu_normal_l.tga 0.234375000000 0.589843750000 0.255859375000 0.621093750000
+r2_main_menu_normal_r.tga 0.257812500000 0.589843750000 0.279296875000 0.621093750000
+r2_main_menu_over_l.tga 0.281250000000 0.589843750000 0.302734375000 0.621093750000
+r2_main_menu_over_r.tga 0.304687500000 0.589843750000 0.326171875000 0.621093750000
+r2_main_menu_pushed_l.tga 0.843750000000 0.589843750000 0.865234375000 0.621093750000
+r2_main_menu_pushed_r.tga 0.867187500000 0.589843750000 0.888671875000 0.621093750000
+action_next.tga 0.890625000000 0.589843750000 0.916015625000 0.615234375000
+W_slot_spell_selected.tga 0.917968750000 0.589843750000 0.943359375000 0.615234375000
+w_slot_win_menu.tga 0.945312500000 0.589843750000 0.970703125000 0.615234375000
+W_slot_brick_selected.tga 0.972656250000 0.589843750000 0.998046875000 0.615234375000
+W_slot_spell_over.tga 0.109375000000 0.593750000000 0.134765625000 0.619140625000
+W_slot_brick.tga 0.328125000000 0.593750000000 0.353515625000 0.619140625000
+action_cycle.tga 0.355468750000 0.593750000000 0.380859375000 0.619140625000
+W_slot_spell.tga 0.382812500000 0.593750000000 0.408203125000 0.619140625000
+r2ed_forest_pushed_l.tga 0.718750000000 0.593750000000 0.739257812500 0.625000000000
+r2ed_forest_l.tga 0.742187500000 0.593750000000 0.762695312500 0.625000000000
+bg_jauge_bot.tga 0.410156250000 0.605468750000 0.535156250000 0.610351562500
+bg_source_top.tga 0.812500000000 0.386718750000 0.960937500000 0.390625000000
+TB_quit.tga 0.000000000000 0.597656250000 0.023437500000 0.621093750000
+TB_spellbook.tga 0.023437500000 0.597656250000 0.046875000000 0.621093750000
+TB_System.tga 0.046875000000 0.597656250000 0.070312500000 0.621093750000
+teammate_map.tga 0.070312500000 0.597656250000 0.093750000000 0.621093750000
+teammate_map_over.tga 0.136718750000 0.601562500000 0.160156250000 0.625000000000
+r2_palette_act.tga 0.160156250000 0.601562500000 0.183593750000 0.625000000000
+r2_palette_components.tga 0.183593750000 0.601562500000 0.207031250000 0.625000000000
+r2_palette_entities.tga 0.207031250000 0.601562500000 0.230468750000 0.625000000000
+r2_icon_stop_live_small.tga 0.535156250000 0.605468750000 0.558593750000 0.628906250000
+r2ed_down_element.tga 0.558593750000 0.605468750000 0.582031250000 0.628906250000
+r2ed_toolbar_lock_small.tga 0.582031250000 0.605468750000 0.605468750000 0.628906250000
+ency_rite_slot.tga 0.605468750000 0.605468750000 0.628906250000 0.628906250000
+r2ed_edit_dialog_over_small.tga 0.628906250000 0.605468750000 0.652343750000 0.628906250000
+r2_toolbar_repeat_road_small.tga 0.652343750000 0.605468750000 0.675781250000 0.628906250000
+r2ed_edit_dialog_pushed_small.tga 0.675781250000 0.605468750000 0.699218750000 0.628906250000
+r2_icon_new_scenario_small.tga 0.765625000000 0.605468750000 0.789062500000 0.628906250000
+r2_icon_palette_small.tga 0.789062500000 0.605468750000 0.812500000000 0.628906250000
+r2_icon_player_admin_small.tga 0.812500000000 0.605468750000 0.835937500000 0.628906250000
+forage_content.tga 0.410156250000 0.613281250000 0.433593750000 0.636718750000
+r2_icon_map_small.tga 0.433593750000 0.613281250000 0.457031250000 0.636718750000
+forage_danger.tga 0.457031250000 0.613281250000 0.480468750000 0.636718750000
+r2_toolbar_set_as_leader_small.tga 0.480468750000 0.613281250000 0.503906250000 0.636718750000
+r2_palette_objets.tga 0.503906250000 0.613281250000 0.527343750000 0.636718750000
+r2_icon_preferences.tga 0.890625000000 0.617187500000 0.914062500000 0.640625000000
+r2_icon_r2_small.tga 0.914062500000 0.617187500000 0.937500000000 0.640625000000
+r2_icon_resetwindows.tga 0.937500000000 0.617187500000 0.960937500000 0.640625000000
+r2_icon_save_small.tga 0.960937500000 0.617187500000 0.984375000000 0.640625000000
+rap_not_invited_dm.tga 0.000000000000 0.621093750000 0.023437500000 0.644531250000
+r2ed_icon_move.tga 0.023437500000 0.621093750000 0.046875000000 0.644531250000
+r2ed_icon_newactivity.tga 0.046875000000 0.621093750000 0.070312500000 0.644531250000
+r2_icon_scenario_prop.tga 0.070312500000 0.621093750000 0.093750000000 0.644531250000
+r2_icon_scenario_small.tga 0.093750000000 0.621093750000 0.117187500000 0.644531250000
+m_back.tga 0.230468750000 0.621093750000 0.253906250000 0.644531250000
+pvp_green.tga 0.253906250000 0.621093750000 0.277343750000 0.644531250000
+pvp_orange.tga 0.277343750000 0.621093750000 0.300781250000 0.644531250000
+pvp_red.tga 0.300781250000 0.621093750000 0.324218750000 0.644531250000
+r2ed_toolbar_rest_zone_small.tga 0.324218750000 0.621093750000 0.347656250000 0.644531250000
+forage_life.tga 0.347656250000 0.621093750000 0.371093750000 0.644531250000
+r2_icon_stop_test_small.tga 0.371093750000 0.621093750000 0.394531250000 0.644531250000
+lm_target.tga 0.835937500000 0.621093750000 0.859375000000 0.644531250000
+lm_target_over.tga 0.859375000000 0.621093750000 0.882812500000 0.644531250000
+lm_target_pushed.tga 0.117187500000 0.625000000000 0.140625000000 0.648437500000
+lm_user.tga 0.140625000000 0.625000000000 0.164062500000 0.648437500000
+lm_user_pushed.tga 0.164062500000 0.625000000000 0.187500000000 0.648437500000
+mektoub_map.tga 0.187500000000 0.625000000000 0.210937500000 0.648437500000
+r2ed_edit_events_over_small.tga 0.699218750000 0.625000000000 0.722656250000 0.648437500000
+mektoub_map_over.tga 0.722656250000 0.625000000000 0.746093750000 0.648437500000
+r2ed_edit_events_pushed_small.tga 0.527343750000 0.628906250000 0.550781250000 0.652343750000
+r2ed_edit_events_small.tga 0.550781250000 0.628906250000 0.574218750000 0.652343750000
+r2ed_entry_point.tga 0.574218750000 0.628906250000 0.597656250000 0.652343750000
+r2ed_entry_point_over.tga 0.597656250000 0.628906250000 0.621093750000 0.652343750000
+r2ed_entry_point_pushed.tga 0.621093750000 0.628906250000 0.644531250000 0.652343750000
+r2_palette_scenario.tga 0.644531250000 0.628906250000 0.667968750000 0.652343750000
+r2_palette_zones.tga 0.667968750000 0.628906250000 0.691406250000 0.652343750000
+r2_toolbar_stand_still_small.tga 0.746093750000 0.628906250000 0.769531250000 0.652343750000
+r2_icon_support.tga 0.769531250000 0.628906250000 0.792968750000 0.652343750000
+forage_spawn.tga 0.792968750000 0.628906250000 0.816406250000 0.652343750000
+r2ed_icon_rotate.tga 0.394531250000 0.636718750000 0.417968750000 0.660156250000
+r2ed_tool_extend_prim_small.tga 0.417968750000 0.636718750000 0.441406250000 0.660156250000
+r2ed_invalid_event_small.tga 0.441406250000 0.636718750000 0.464843750000 0.660156250000
+r2_toolbar_ungroup_small.tga 0.464843750000 0.636718750000 0.488281250000 0.660156250000
+r2ed_toolbar_show_small.tga 0.488281250000 0.636718750000 0.511718750000 0.660156250000
+r2ed_kicked_char.tga 0.882812500000 0.640625000000 0.906250000000 0.664062500000
+r2ed_edit_dialog_small.tga 0.906250000000 0.640625000000 0.929687500000 0.664062500000
+arbo_level_24.tga 0.929687500000 0.640625000000 0.953125000000 0.664062500000
+r2ed_left_sequence.tga 0.953125000000 0.640625000000 0.976562500000 0.664062500000
+r2_scenario_small.tga 0.976562500000 0.640625000000 1.000000000000 0.664062500000
+r2_toolbar_wander_zone_small.tga 0.000000000000 0.644531250000 0.023437500000 0.667968750000
+rap_invited_dm.tga 0.023437500000 0.644531250000 0.046875000000 0.667968750000
+r2ed_connected_char.tga 0.046875000000 0.644531250000 0.070312500000 0.667968750000
+rap_invited_no_dm.tga 0.070312500000 0.644531250000 0.093750000000 0.667968750000
+r2ed_toolbar_unfreeze_small.tga 0.093750000000 0.644531250000 0.117187500000 0.667968750000
+r2ed_tool_new_vertex_small.tga 0.210937500000 0.644531250000 0.234375000000 0.667968750000
+r2ed_not_current_act.tga 0.234375000000 0.644531250000 0.257812500000 0.667968750000
+r2_toolbar_customize_look_small.tga 0.257812500000 0.644531250000 0.281250000000 0.667968750000
+lm_continent.tga 0.281250000000 0.644531250000 0.304687500000 0.667968750000
+lm_continent_pushed.tga 0.304687500000 0.644531250000 0.328125000000 0.667968750000
+lm_home.tga 0.328125000000 0.644531250000 0.351562500000 0.667968750000
+lm_home_over.tga 0.351562500000 0.644531250000 0.375000000000 0.667968750000
+lm_home_pushed.tga 0.816406250000 0.644531250000 0.839843750000 0.667968750000
+r2_toolbar_delete_small.tga 0.839843750000 0.644531250000 0.863281250000 0.667968750000
+lm_mission.tga 0.117187500000 0.648437500000 0.140625000000 0.671875000000
+lm_mission_pushed.tga 0.140625000000 0.648437500000 0.164062500000 0.671875000000
+lm_over.tga 0.164062500000 0.648437500000 0.187500000000 0.671875000000
+r2_toolbar_follow_road_small.tga 0.187500000000 0.648437500000 0.210937500000 0.671875000000
+lm_respawn.tga 0.691406250000 0.648437500000 0.714843750000 0.671875000000
+lm_respawn_over.tga 0.714843750000 0.648437500000 0.738281250000 0.671875000000
+r2ed_tool_select_move_small.tga 0.511718750000 0.652343750000 0.535156250000 0.675781250000
+r2_icon_go_test_small.tga 0.535156250000 0.652343750000 0.558593750000 0.675781250000
+r2_icon_keys_small.tga 0.558593750000 0.652343750000 0.582031250000 0.675781250000
+r2_icon_light_off_small.tga 0.582031250000 0.652343750000 0.605468750000 0.675781250000
+r2_icon_light_on_small.tga 0.605468750000 0.652343750000 0.628906250000 0.675781250000
+r2_icon_load_small.tga 0.628906250000 0.652343750000 0.652343750000 0.675781250000
+r2_icon_mail_box_small.tga 0.652343750000 0.652343750000 0.675781250000 0.675781250000
+r2ed_toolbar_unlock_small.tga 0.738281250000 0.652343750000 0.761718750000 0.675781250000
+r2ed_right_sequence.tga 0.761718750000 0.652343750000 0.785156250000 0.675781250000
+r2ed_sun.tga 0.785156250000 0.652343750000 0.808593750000 0.675781250000
+r2ed_toolbar_hide_small.tga 0.375000000000 0.660156250000 0.398437500000 0.683593750000
+r2_toolbar_group_small.tga 0.398437500000 0.660156250000 0.421875000000 0.683593750000
+r2ed_toolbar_work_zone_small.tga 0.421875000000 0.660156250000 0.445312500000 0.683593750000
+r2_icon_chat_small.tga 0.445312500000 0.660156250000 0.468750000000 0.683593750000
+r2ed_permanent_content_small.tga 0.468750000000 0.660156250000 0.492187500000 0.683593750000
+W_slot_brick_disabled.tga 0.863281250000 0.664062500000 0.886718750000 0.687500000000
+r2_toolbar_kill_small.tga 0.886718750000 0.664062500000 0.910156250000 0.687500000000
+r2ed_tool_rotate_small.tga 0.910156250000 0.664062500000 0.933593750000 0.687500000000
+forage_time.tga 0.933593750000 0.664062500000 0.957031250000 0.687500000000
+r2ed_toolbar_feed_zone_small.tga 0.957031250000 0.664062500000 0.980468750000 0.687500000000
+r2ed_toolbar_hunt_zone_small.tga 0.000000000000 0.667968750000 0.023437500000 0.691406250000
+W_button_24_over.tga 0.023437500000 0.667968750000 0.046875000000 0.691406250000
+r2_toolbar_patrol_road_small.tga 0.046875000000 0.667968750000 0.070312500000 0.691406250000
+r2ed_toolbar_freeze_small.tga 0.070312500000 0.667968750000 0.093750000000 0.691406250000
+lm_respawn_pushed.tga 0.093750000000 0.667968750000 0.117187500000 0.691406250000
+arbo_close_just_one_24.tga 0.210937500000 0.667968750000 0.234375000000 0.691406250000
+ency_rite_done.tga 0.234375000000 0.667968750000 0.257812500000 0.691406250000
+r2ed_toolbar_guard_zone_small.tga 0.257812500000 0.667968750000 0.281250000000 0.691406250000
+TB_Forum_ring.tga 0.281250000000 0.667968750000 0.304687500000 0.691406250000
+TB_help.tga 0.304687500000 0.667968750000 0.328125000000 0.691406250000
+TB_identity.tga 0.328125000000 0.667968750000 0.351562500000 0.691406250000
+r2ed_current_act_content_small.tga 0.351562500000 0.667968750000 0.375000000000 0.691406250000
+r2_toolbar_properties_small.tga 0.808593750000 0.667968750000 0.832031250000 0.691406250000
+TB_interaction.tga 0.832031250000 0.667968750000 0.855468750000 0.691406250000
+r2ed_up_element.tga 0.117187500000 0.671875000000 0.140625000000 0.695312500000
+TB_inventory.tga 0.140625000000 0.671875000000 0.164062500000 0.695312500000
+TB_map.tga 0.164062500000 0.671875000000 0.187500000000 0.695312500000
+r2_allow_small.tga 0.187500000000 0.671875000000 0.210937500000 0.695312500000
+TB_missions.tga 0.675781250000 0.671875000000 0.699218750000 0.695312500000
+fame_blank.tga 0.699218750000 0.671875000000 0.738281250000 0.685546875000
+fame_arrow_down.tga 0.492187500000 0.675781250000 0.531250000000 0.689453125000
+fame_arrow_up.tga 0.531250000000 0.675781250000 0.570312500000 0.689453125000
+fame_arrow_updown.tga 0.570312500000 0.675781250000 0.609375000000 0.689453125000
+bg_jauge_top.tga 0.855468750000 0.687500000000 0.980468750000 0.691406250000
+w_slot_consider.tga 0.089843750000 0.222656250000 0.121093750000 0.238281250000
+r2_gradient.tga 0.210937500000 0.691406250000 0.335937500000 0.695312500000
+consider_1.tga 0.609375000000 0.675781250000 0.640625000000 0.691406250000
+consider_2.tga 0.640625000000 0.675781250000 0.671875000000 0.691406250000
+consider_3.tga 0.738281250000 0.675781250000 0.769531250000 0.691406250000
+consider_4.tga 0.769531250000 0.675781250000 0.800781250000 0.691406250000
+consider_5.tga 0.375000000000 0.683593750000 0.406250000000 0.699218750000
+consider_6.tga 0.406250000000 0.683593750000 0.437500000000 0.699218750000
+consider_7.tga 0.437500000000 0.683593750000 0.468750000000 0.699218750000
+w_button_32_over.tga 0.699218750000 0.687500000000 0.730468750000 0.703125000000
+r2ed_triggers_select.tga 0.468750000000 0.683593750000 0.490234375000 0.706054687500
+r2_select_menu_over_l.tga 0.984375000000 0.457031250000 0.998046875000 0.488281250000
+r2_select_menu_pushed_l.tga 0.980468750000 0.488281250000 0.994140625000 0.519531250000
+skill_arbo_son_without_son.tga 0.980468750000 0.519531250000 0.994140625000 0.550781250000
+skill_arbo_close_just_one.tga 0.980468750000 0.664062500000 0.994140625000 0.695312500000
+skill_arbo_level.tga 0.000000000000 0.691406250000 0.013671875000 0.722656250000
+skill_arbo_open_first.tga 0.015625000000 0.691406250000 0.029296875000 0.722656250000
+skill_arbo_son.tga 0.031250000000 0.691406250000 0.044921875000 0.722656250000
+skill_arbo_son_last.tga 0.046875000000 0.691406250000 0.060546875000 0.722656250000
+r2_select_menu_l.tga 0.062500000000 0.691406250000 0.076171875000 0.722656250000
+r2_icon_dialog_mini_over.tga 0.699218750000 0.605468750000 0.718750000000 0.625000000000
+r2_icon_dialog_mini_pushed.tga 0.210937500000 0.625000000000 0.230468750000 0.644531250000
+r2_icon_action_mini_over.tga 0.863281250000 0.644531250000 0.882812500000 0.664062500000
+r2_icon_reaction_mini.tga 0.078125000000 0.691406250000 0.097656250000 0.710937500000
+r2_icon_reaction_mini_over.tga 0.097656250000 0.691406250000 0.117187500000 0.710937500000
+r2_icon_reaction_mini_pushed.tga 0.335937500000 0.691406250000 0.355468750000 0.710937500000
+r2_icon_action_mini_pushed.tga 0.355468750000 0.691406250000 0.375000000000 0.710937500000
+r2ed_open_activities.tga 0.492187500000 0.691406250000 0.511718750000 0.710937500000
+r2_icon_action_mini.tga 0.511718750000 0.691406250000 0.531250000000 0.710937500000
+r2_icon_event_trigger_mini.tga 0.531250000000 0.691406250000 0.550781250000 0.710937500000
+r2_icon_event_trigger_mini_over.tga 0.550781250000 0.691406250000 0.570312500000 0.710937500000
+r2_icon_event_trigger_mini_pushed.tga 0.570312500000 0.691406250000 0.589843750000 0.710937500000
+r2_icon_dialog_mini.tga 0.589843750000 0.691406250000 0.609375000000 0.710937500000
+mp3_button_slot.tga 0.609375000000 0.691406250000 0.630859375000 0.708984375000
+w_button_mode_over.tga 0.632812500000 0.691406250000 0.646484375000 0.718750000000
+w_mode_choice.tga 0.648437500000 0.691406250000 0.662109375000 0.718750000000
+details_on.tga 0.964843750000 0.218750000000 0.988281250000 0.234375000000
+qh_on_l.tga 0.109375000000 0.570312500000 0.125000000000 0.593750000000
+qh_on_r.tga 0.093750000000 0.597656250000 0.109375000000 0.621093750000
+r2_select_bar_start_normal_l.tga 0.664062500000 0.691406250000 0.675781250000 0.722656250000
+r2_select_bar_start_normal_r.tga 0.730468750000 0.691406250000 0.742187500000 0.722656250000
+qh_off_r.tga 0.984375000000 0.617187500000 1.000000000000 0.640625000000
+mp3_vol_jauge.tga 0.148437500000 0.242187500000 0.195312500000 0.250000000000
+details_off.tga 0.125000000000 0.359375000000 0.148437500000 0.375000000000
+skin_header_l.tga 0.742187500000 0.691406250000 0.753906250000 0.722656250000
+w_button_filter_off.tga 0.437500000000 0.359375000000 0.460937500000 0.375000000000
+w_button_filter_on.tga 0.976562500000 0.375000000000 1.000000000000 0.390625000000
+qh_off_l.tga 0.753906250000 0.691406250000 0.769531250000 0.714843750000
+filter_armor.tga 0.769531250000 0.691406250000 0.792968750000 0.707031250000
+r2_select_bar_start_over_l.tga 0.792968750000 0.691406250000 0.804687500000 0.722656250000
+filter_mission.tga 0.804687500000 0.691406250000 0.828125000000 0.707031250000
+filter_mps.tga 0.828125000000 0.691406250000 0.851562500000 0.707031250000
+r2_select_bar_start_over_r.tga 0.851562500000 0.691406250000 0.863281250000 0.722656250000
+r2_select_bar_start_pushed_l.tga 0.863281250000 0.691406250000 0.875000000000 0.722656250000
+r2_select_bar_start_pushed_r.tga 0.875000000000 0.691406250000 0.886718750000 0.722656250000
+w_l0_tl_title.tga 0.886718750000 0.691406250000 0.902343750000 0.714843750000
+filter_tools.tga 0.902343750000 0.691406250000 0.925781250000 0.707031250000
+W_slot_jauge_1_mini.tga 0.457031250000 0.597656250000 0.519531250000 0.603515625000
+filter_weapon.tga 0.925781250000 0.691406250000 0.949218750000 0.707031250000
+w_button_18_over.tga 0.949218750000 0.691406250000 0.966796875000 0.708984375000
+mp3_button_pause.tga 0.816406250000 0.628906250000 0.835937500000 0.644531250000
+mp3_button_play.tga 0.375000000000 0.644531250000 0.394531250000 0.660156250000
+mp3_button_previous.tga 0.492187500000 0.660156250000 0.511718750000 0.675781250000
+Switch_Ratio.tga 0.117187500000 0.695312500000 0.136718750000 0.710937500000
+Switch_Text_Icon.tga 0.136718750000 0.695312500000 0.156250000000 0.710937500000
+mp3_button_list.tga 0.156250000000 0.695312500000 0.175781250000 0.710937500000
+mp3_button_next.tga 0.175781250000 0.695312500000 0.195312500000 0.710937500000
+mp3_button_open.tga 0.195312500000 0.695312500000 0.214843750000 0.710937500000
+mp3_button_over.tga 0.214843750000 0.695312500000 0.234375000000 0.710937500000
+w_tab_down_pushed_r.tga 0.968750000000 0.691406250000 0.980468750000 0.714843750000
+W_warning.tga 0.234375000000 0.695312500000 0.251953125000 0.710937500000
+w_expand_off.tga 0.253906250000 0.695312500000 0.265625000000 0.718750000000
+w_expand_on.tga 0.265625000000 0.695312500000 0.277343750000 0.718750000000
+w_tab_down_normal_r.tga 0.277343750000 0.695312500000 0.289062500000 0.718750000000
+w_tab_up_normal_r.tga 0.289062500000 0.695312500000 0.300781250000 0.718750000000
+w_tab_up_pushed_r.tga 0.300781250000 0.695312500000 0.312500000000 0.718750000000
+ency_step_slot.tga 0.476562500000 0.218750000000 0.492187500000 0.234375000000
+W_slot_number.tga 0.234375000000 0.574218750000 0.250000000000 0.589843750000
+W_slot_number_selected.tga 0.394531250000 0.621093750000 0.410156250000 0.636718750000
+W_slot_number_unselected.tga 0.511718750000 0.636718750000 0.527343750000 0.652343750000
+r2_icon_select.tga 0.675781250000 0.652343750000 0.691406250000 0.667968750000
+r2_glow_star.tga 0.312500000000 0.695312500000 0.328125000000 0.710937500000
+W_user_info.tga 0.675781250000 0.695312500000 0.691406250000 0.710937500000
+r2_suspension.tga 0.980468750000 0.695312500000 0.996093750000 0.710937500000
+w_zoom_in.tga 0.375000000000 0.699218750000 0.390625000000 0.714843750000
+w_zoom_out.tga 0.390625000000 0.699218750000 0.406250000000 0.714843750000
+r2ed_ring_rating_1.tga 0.406250000000 0.699218750000 0.421875000000 0.714843750000
+r2_icon_speak_as_small.tga 0.421875000000 0.699218750000 0.437500000000 0.714843750000
+r2_icon_speak_as_small_over.tga 0.437500000000 0.699218750000 0.453125000000 0.714843750000
+r2_icon_speak_as_small_pushed.tga 0.453125000000 0.699218750000 0.468750000000 0.714843750000
+w_center_map.tga 0.691406250000 0.703125000000 0.707031250000 0.718750000000
+W_close_0.tga 0.707031250000 0.703125000000 0.722656250000 0.718750000000
+r2ed_ring_rating_10.tga 0.468750000000 0.707031250000 0.484375000000 0.722656250000
+bulle_next.tga 0.769531250000 0.707031250000 0.785156250000 0.722656250000
+r2ed_ring_rating_2.tga 0.804687500000 0.707031250000 0.820312500000 0.722656250000
+r2_icon_map_invalid.tga 0.820312500000 0.707031250000 0.835937500000 0.722656250000
+w_arrow_left_0.tga 0.835937500000 0.707031250000 0.851562500000 0.722656250000
+W_arrow_right_0.tga 0.902343750000 0.707031250000 0.917968750000 0.722656250000
+W_arrow_up_0.tga 0.917968750000 0.707031250000 0.933593750000 0.722656250000
+w_back_map.tga 0.933593750000 0.707031250000 0.949218750000 0.722656250000
+W_button_16_over.tga 0.078125000000 0.710937500000 0.093750000000 0.726562500000
+r2ed_ring_rating_3.tga 0.093750000000 0.710937500000 0.109375000000 0.726562500000
+r2ed_ring_rating_4.tga 0.109375000000 0.710937500000 0.125000000000 0.726562500000
+money_seve.tga 0.125000000000 0.710937500000 0.140625000000 0.726562500000
+w_add.tga 0.140625000000 0.710937500000 0.156250000000 0.726562500000
+W_answer_16_cancel.tga 0.156250000000 0.710937500000 0.171875000000 0.726562500000
+W_answer_16_valid.tga 0.171875000000 0.710937500000 0.187500000000 0.726562500000
+W_arrow_down_0.tga 0.187500000000 0.710937500000 0.203125000000 0.726562500000
+r2ed_ring_rating_5.tga 0.203125000000 0.710937500000 0.218750000000 0.726562500000
+r2_mini_activity_chat.tga 0.218750000000 0.710937500000 0.234375000000 0.726562500000
+r2ed_ring_rating_6.tga 0.234375000000 0.710937500000 0.250000000000 0.726562500000
+W_button_default.tga 0.312500000000 0.710937500000 0.328125000000 0.726562500000
+W_button_edit.tga 0.328125000000 0.710937500000 0.343750000000 0.726562500000
+bgd_pause.tga 0.343750000000 0.710937500000 0.359375000000 0.726562500000
+r2_icon_possess_small.tga 0.359375000000 0.710937500000 0.375000000000 0.726562500000
+r2_icon_possess_small_over.tga 0.484375000000 0.710937500000 0.500000000000 0.726562500000
+r2_icon_possess_small_pushed.tga 0.500000000000 0.710937500000 0.515625000000 0.726562500000
+r2ed_ring_rating_7.tga 0.515625000000 0.710937500000 0.531250000000 0.726562500000
+r2ed_ring_rating_8.tga 0.531250000000 0.710937500000 0.546875000000 0.726562500000
+r2_mini_activity_empty_chat.tga 0.546875000000 0.710937500000 0.562500000000 0.726562500000
+r2_mini_activity_feed_zone.tga 0.562500000000 0.710937500000 0.578125000000 0.726562500000
+r2_mini_activity_follow_road.tga 0.578125000000 0.710937500000 0.593750000000 0.726562500000
+r2_mini_activity_guard_zone.tga 0.593750000000 0.710937500000 0.609375000000 0.726562500000
+r2_mini_activity_hunt_zone.tga 0.609375000000 0.710937500000 0.625000000000 0.726562500000
+r2_mini_activity_inactive.tga 0.675781250000 0.710937500000 0.691406250000 0.726562500000
+pin_off.tga 0.949218750000 0.710937500000 0.964843750000 0.726562500000
+pin_on.tga 0.980468750000 0.710937500000 0.996093750000 0.726562500000
+r2_mini_activity_patrol_road.tga 0.375000000000 0.714843750000 0.390625000000 0.730468750000
+r2_mini_activity_repeat_road.tga 0.390625000000 0.714843750000 0.406250000000 0.730468750000
+target_mission.tga 0.406250000000 0.714843750000 0.421875000000 0.730468750000
+r2_mini_activity_rest_zone.tga 0.421875000000 0.714843750000 0.437500000000 0.730468750000
+r2_mini_activity_stand_still.tga 0.437500000000 0.714843750000 0.453125000000 0.730468750000
+r2_mini_activity_wander_zone.tga 0.453125000000 0.714843750000 0.468750000000 0.730468750000
+W_rename_16.tga 0.753906250000 0.714843750000 0.769531250000 0.730468750000
+w_restore.tga 0.886718750000 0.714843750000 0.902343750000 0.730468750000
+r2_mini_activity_work_zone.tga 0.964843750000 0.714843750000 0.980468750000 0.730468750000
+r2ed_ring_rating_9.tga 0.250000000000 0.718750000000 0.265625000000 0.734375000000
+r2ed_triggers_more.tga 0.265625000000 0.718750000000 0.281250000000 0.734375000000
+r2_map_edge_test.tga 0.281250000000 0.718750000000 0.296875000000 0.734375000000
+r2ed_triggers_trash.tga 0.296875000000 0.718750000000 0.312500000000 0.734375000000
+w_button_radar_plus.tga 0.625000000000 0.718750000000 0.640625000000 0.734375000000
+bulle_quit.tga 0.640625000000 0.718750000000 0.656250000000 0.734375000000
+W_button_reset.tga 0.691406250000 0.718750000000 0.707031250000 0.734375000000
+r2_map_foot_steps.tga 0.000000000000 0.722656250000 0.031250000000 0.730468750000
+ency_step_done.tga 0.707031250000 0.718750000000 0.722656250000 0.734375000000
+w_button_10x24_over.tga 0.031250000000 0.722656250000 0.041015625000 0.746093750000
+w_button_spellock_over.tga 0.042968750000 0.722656250000 0.066406250000 0.731445312500
+w_button_spellock_on.tga 0.722656250000 0.722656250000 0.746093750000 0.731445312500
+w_button_spellock_off.tga 0.769531250000 0.722656250000 0.792968750000 0.731445312500
+r2ed_icon_permanent_group.tga 0.468750000000 0.722656250000 0.482421875000 0.736328125000
+r2ed_icon_permanent_group_creatures.tga 0.656250000000 0.722656250000 0.669921875000 0.736328125000
+r2ed_icon_permanent_macro_components.tga 0.792968750000 0.722656250000 0.806640625000 0.736328125000
+w_affected.tga 0.808593750000 0.722656250000 0.822265625000 0.736328125000
+r2ed_icon_region.tga 0.824218750000 0.722656250000 0.837890625000 0.736328125000
+W_slot_mood.tga 0.839843750000 0.722656250000 0.853515625000 0.736328125000
+r2ed_permanent_pins.tga 0.855468750000 0.722656250000 0.869140625000 0.736328125000
+w_sound_off.tga 0.871093750000 0.722656250000 0.884765625000 0.736328125000
+w_sound_on.tga 0.902343750000 0.722656250000 0.916015625000 0.736328125000
+w_button_radar_moins.tga 0.917968750000 0.722656250000 0.931640625000 0.736328125000
+w_button_14_over.tga 0.933593750000 0.722656250000 0.947265625000 0.736328125000
+w_slot_on.tga 0.066406250000 0.726562500000 0.080078125000 0.740234375000
+arbo_son_last.tga 0.082031250000 0.726562500000 0.095703125000 0.740234375000
+arbo_son_without_son.tga 0.097656250000 0.726562500000 0.111328125000 0.740234375000
+r2_icon_components_tasks.tga 0.113281250000 0.726562500000 0.126953125000 0.740234375000
+r2_icon_components_trigger.tga 0.128906250000 0.726562500000 0.142578125000 0.740234375000
+r2_icon_create.tga 0.144531250000 0.726562500000 0.158203125000 0.740234375000
+arbo_son.tga 0.160156250000 0.726562500000 0.173828125000 0.740234375000
+arbo_close_just_one.tga 0.175781250000 0.726562500000 0.189453125000 0.740234375000
+contact_chat.tga 0.191406250000 0.726562500000 0.205078125000 0.740234375000
+W_offline.tga 0.207031250000 0.726562500000 0.220703125000 0.740234375000
+w_on.tga 0.222656250000 0.726562500000 0.236328125000 0.740234375000
+W_online.tga 0.312500000000 0.726562500000 0.326171875000 0.740234375000
+w_win_close.tga 0.328125000000 0.726562500000 0.341796875000 0.740234375000
+w_win_lock.tga 0.343750000000 0.726562500000 0.357421875000 0.740234375000
+w_win_popin.tga 0.359375000000 0.726562500000 0.373046875000 0.740234375000
+w_win_popup.tga 0.484375000000 0.726562500000 0.498046875000 0.740234375000
+w_online_abroad.tga 0.500000000000 0.726562500000 0.513671875000 0.740234375000
+w_opacity_on.tga 0.515625000000 0.726562500000 0.529296875000 0.740234375000
+w_help_1.tga 0.531250000000 0.726562500000 0.544921875000 0.740234375000
+w_pad_close.tga 0.546875000000 0.726562500000 0.560546875000 0.740234375000
+arbo_open_first.tga 0.562500000000 0.726562500000 0.576171875000 0.740234375000
+animal_inventory.tga 0.578125000000 0.726562500000 0.591796875000 0.740234375000
+r2_icon_far.tga 0.593750000000 0.726562500000 0.607421875000 0.740234375000
+arbo_level.tga 0.609375000000 0.726562500000 0.623046875000 0.740234375000
+r2ed_icon_road.tga 0.671875000000 0.726562500000 0.685546875000 0.740234375000
+r2ed_icon_act.tga 0.949218750000 0.726562500000 0.962890625000 0.740234375000
+r2ed_icon_botobject.tga 0.980468750000 0.726562500000 0.994140625000 0.740234375000
+r2ed_icon_creatures.tga 0.000000000000 0.730468750000 0.013671875000 0.744140625000
+r2ed_icon_default_feature.tga 0.015625000000 0.730468750000 0.029296875000 0.744140625000
+r2ed_icon_group.tga 0.375000000000 0.730468750000 0.388671875000 0.744140625000
+r2ed_icon_group_creatures.tga 0.390625000000 0.730468750000 0.404296875000 0.744140625000
+r2ed_icon_macro_components.tga 0.406250000000 0.730468750000 0.419921875000 0.744140625000
+r2ed_permanent_node.tga 0.421875000000 0.730468750000 0.435546875000 0.744140625000
+r2_icon_properties.tga 0.437500000000 0.730468750000 0.451171875000 0.744140625000
+r2ed_icon_npc.tga 0.453125000000 0.730468750000 0.466796875000 0.744140625000
+r2ed_icon_permanent_creatures.tga 0.746093750000 0.730468750000 0.759765625000 0.744140625000
+quit_button_normal_r.tga 0.187500000000 0.195312500000 0.195312500000 0.218750000000
+quit_button_over_l.tga 0.187500000000 0.218750000000 0.195312500000 0.242187500000
+quit_button_over_r.tga 0.312500000000 0.250000000000 0.320312500000 0.273437500000
+quit_button_pushed_l.tga 0.992187500000 0.250000000000 1.000000000000 0.273437500000
+quit_button_pushed_r.tga 0.992187500000 0.390625000000 1.000000000000 0.414062500000
+r2_select_menu_r.tga 0.992187500000 0.414062500000 0.998046875000 0.445312500000
+r2_select_menu_over_r.tga 0.238281250000 0.726562500000 0.244140625000 0.757812500000
+w_slot_jauge_1_umin.tga 0.246093750000 0.734375000000 0.277343750000 0.740234375000
+r2_select_menu_pushed_r.tga 0.761718750000 0.730468750000 0.767578125000 0.761718750000
+quit_button_normal_l.tga 0.546875000000 0.429687500000 0.554687500000 0.453125000000
+target.tga 0.042968750000 0.734375000000 0.059570312500 0.745117187500
+flag-en.tga 0.515625000000 0.585937500000 0.530273437500 0.597656250000
+flag-fr.tga 0.410156250000 0.593750000000 0.424804687500 0.605468750000
+flag-de.tga 0.765625000000 0.593750000000 0.780273437500 0.605468750000
+w_trade_player_ready.tga 0.886718750000 0.730468750000 0.898437500000 0.744140625000
+num_6.tga 0.964843750000 0.730468750000 0.976562500000 0.744140625000
+num_7.tga 0.277343750000 0.734375000000 0.289062500000 0.748046875000
+W_warning_2.tga 0.289062500000 0.734375000000 0.302734375000 0.746093750000
+num_8.tga 0.625000000000 0.734375000000 0.636718750000 0.748046875000
+num_9.tga 0.636718750000 0.734375000000 0.648437500000 0.748046875000
+w_defense_normal_m.tga 0.988281250000 0.000000000000 0.992187500000 0.041015625000
+w_defense_normal_r.tga 0.988281250000 0.042968750000 0.992187500000 0.083984375000
+w_defense_r.tga 0.996093750000 0.488281250000 1.000000000000 0.529296875000
+w_defense_l.tga 0.996093750000 0.664062500000 1.000000000000 0.705078125000
+w_defense_m.tga 0.996093750000 0.707031250000 1.000000000000 0.748046875000
+w_defense_normal_l.tga 0.687500000000 0.726562500000 0.691406250000 0.767578125000
+num_0.tga 0.691406250000 0.734375000000 0.703125000000 0.748046875000
+num_1.tga 0.703125000000 0.734375000000 0.714843750000 0.748046875000
+num_2.tga 0.714843750000 0.734375000000 0.726562500000 0.748046875000
+num_3.tga 0.726562500000 0.734375000000 0.738281250000 0.748046875000
+num_4.tga 0.769531250000 0.734375000000 0.781250000000 0.748046875000
+num_5.tga 0.781250000000 0.734375000000 0.792968750000 0.748046875000
+w_trade_other_ready.tga 0.468750000000 0.738281250000 0.480468750000 0.751953125000
+W_button_12_over.tga 0.160156250000 0.468750000000 0.171875000000 0.480468750000
+W_arrow_down_1.tga 0.648437500000 0.738281250000 0.660156250000 0.750000000000
+W_mood_pow1.tga 0.660156250000 0.738281250000 0.671875000000 0.750000000000
+W_weight.tga 0.792968750000 0.738281250000 0.804687500000 0.750000000000
+W_mood_pow0.tga 0.804687500000 0.738281250000 0.816406250000 0.750000000000
+W_mood_pow2.tga 0.816406250000 0.738281250000 0.828125000000 0.750000000000
+W_mood_pow3.tga 0.828125000000 0.738281250000 0.839843750000 0.750000000000
+r2ed_triggers_little_chat.tga 0.839843750000 0.738281250000 0.851562500000 0.750000000000
+r2ed_triggers_little_less.tga 0.851562500000 0.738281250000 0.863281250000 0.750000000000
+r2ed_triggers_little_more.tga 0.863281250000 0.738281250000 0.875000000000 0.750000000000
+r2ed_triggers_little_trash.tga 0.875000000000 0.738281250000 0.886718750000 0.750000000000
+r2ed_triggers_maximize.tga 0.898437500000 0.738281250000 0.910156250000 0.750000000000
+r2ed_triggers_minimize.tga 0.910156250000 0.738281250000 0.921875000000 0.750000000000
+W_arrow_right_1.tga 0.921875000000 0.738281250000 0.933593750000 0.750000000000
+W_mood_pow5.tga 0.933593750000 0.738281250000 0.945312500000 0.750000000000
+W_scale_more_1.tga 0.062500000000 0.742187500000 0.074218750000 0.753906250000
+target_info.tga 0.074218750000 0.742187500000 0.085937500000 0.753906250000
+W_arrow_up_1.tga 0.085937500000 0.742187500000 0.097656250000 0.753906250000
+W_close_1.tga 0.097656250000 0.742187500000 0.109375000000 0.753906250000
+w_copy.tga 0.109375000000 0.742187500000 0.121093750000 0.753906250000
+W_scale_less_1.tga 0.121093750000 0.742187500000 0.132812500000 0.753906250000
+rollout_opened.tga 0.132812500000 0.742187500000 0.143554687500 0.753906250000
+rollout_closed.tga 0.144531250000 0.742187500000 0.155273437500 0.753906250000
+W_magic_sep1.tga 0.535156250000 0.523437500000 0.540039062500 0.548828125000
+W_magic_sep2.tga 0.304687500000 0.734375000000 0.309570312500 0.759765625000
+w_death.tga 0.156250000000 0.742187500000 0.168945312500 0.751953125000
+r2ed_desert_m.tga 0.988281250000 0.085937500000 0.992187500000 0.117187500000
+r2ed_prime_roots_m.tga 0.496093750000 0.343750000000 0.500000000000 0.375000000000
+r2_select_menu_pushed_m.tga 0.351562500000 0.425781250000 0.355468750000 0.457031250000
+r2ed_desert_pushed_m.tga 0.976562500000 0.730468750000 0.980468750000 0.761718750000
+r2ed_desert_pushed_r.tga 0.738281250000 0.734375000000 0.742187500000 0.765625000000
+skin_bl_open.tga 0.476562500000 0.273437500000 0.492187500000 0.281250000000
+r2ed_desert_r.tga 0.742187500000 0.734375000000 0.746093750000 0.765625000000
+skin_el_open.tga 0.972656250000 0.304687500000 0.988281250000 0.312500000000
+r2ed_forest_pushed_m.tga 0.480468750000 0.738281250000 0.484375000000 0.769531250000
+r2ed_jungle_m.tga 0.945312500000 0.738281250000 0.949218750000 0.769531250000
+r2ed_forest_pushed_r.tga 0.171875000000 0.742187500000 0.175781250000 0.773437500000
+r2ed_jungle_pushed_m.tga 0.175781250000 0.742187500000 0.179687500000 0.773437500000
+r2ed_jungle_pushed_r.tga 0.179687500000 0.742187500000 0.183593750000 0.773437500000
+r2ed_jungle_r.tga 0.183593750000 0.742187500000 0.187500000000 0.773437500000
+r2ed_forest_r.tga 0.187500000000 0.742187500000 0.191406250000 0.773437500000
+r2_main_menu_normal_m.tga 0.191406250000 0.742187500000 0.195312500000 0.773437500000
+r2ed_lakes_m.tga 0.195312500000 0.742187500000 0.199218750000 0.773437500000
+r2ed_prime_roots_pushed_m.tga 0.199218750000 0.742187500000 0.203125000000 0.773437500000
+r2ed_lakes_pushed_m.tga 0.203125000000 0.742187500000 0.207031250000 0.773437500000
+r2ed_lakes_pushed_r.tga 0.207031250000 0.742187500000 0.210937500000 0.773437500000
+r2ed_lakes_r.tga 0.210937500000 0.742187500000 0.214843750000 0.773437500000
+curs_m.tga 0.214843750000 0.742187500000 0.218750000000 0.773437500000
+r2ed_prime_roots_pushed_r.tga 0.218750000000 0.742187500000 0.222656250000 0.773437500000
+r2_select_bar_start_over_m.tga 0.222656250000 0.742187500000 0.226562500000 0.773437500000
+r2ed_prime_roots_r.tga 0.226562500000 0.742187500000 0.230468750000 0.773437500000
+r2ed_forest_m.tga 0.230468750000 0.742187500000 0.234375000000 0.773437500000
+r2_select_bar_start_pushed_m.tga 0.234375000000 0.742187500000 0.238281250000 0.773437500000
+r2_main_menu_over_m.tga 0.246093750000 0.742187500000 0.250000000000 0.773437500000
+r2_main_menu_pushed_m.tga 0.250000000000 0.742187500000 0.253906250000 0.773437500000
+r2_select_menu_m.tga 0.253906250000 0.742187500000 0.257812500000 0.773437500000
+r2_select_bar_start_normal_m.tga 0.257812500000 0.742187500000 0.261718750000 0.773437500000
+r2_select_menu_over_m.tga 0.261718750000 0.742187500000 0.265625000000 0.773437500000
+W_L0_EL_open.tga 0.484375000000 0.382812500000 0.500000000000 0.390625000000
+r2_tab_sequence_pushed_r.tga 0.542968750000 0.460937500000 0.546875000000 0.488281250000
+r2_tab_wide_pushed_m.tga 0.531250000000 0.554687500000 0.535156250000 0.582031250000
+r2_tab_wide_pushed_r.tga 0.265625000000 0.742187500000 0.269531250000 0.769531250000
+r2_tab_sequence_pushed_m.tga 0.269531250000 0.742187500000 0.273437500000 0.769531250000
+r2_tab_wide_normal_m.tga 0.273437500000 0.742187500000 0.277343750000 0.769531250000
+r2_tab_wide_normal_r.tga 0.312500000000 0.742187500000 0.316406250000 0.769531250000
+W_arrow_down_2.tga 0.316406250000 0.742187500000 0.326171875000 0.751953125000
+W_close_2.tga 0.328125000000 0.742187500000 0.337890625000 0.751953125000
+W_scale_more_2.tga 0.339843750000 0.742187500000 0.349609375000 0.751953125000
+W_arrow_up_2.tga 0.351562500000 0.742187500000 0.361328125000 0.751953125000
+W_scale_less_2.tga 0.363281250000 0.742187500000 0.373046875000 0.751953125000
+W_button_10_over.tga 0.484375000000 0.742187500000 0.494140625000 0.751953125000
+W_arrow_right_2.tga 0.496093750000 0.742187500000 0.505859375000 0.751953125000
+r2_icon_map_entity_orient.tga 0.507812500000 0.742187500000 0.516601562500 0.752929687500
+quit_button_over_m.tga 0.265625000000 0.402343750000 0.269531250000 0.425781250000
+w_header_r.tga 0.257812500000 0.441406250000 0.261718750000 0.464843750000
+w_tab_pushed_m.tga 0.261718750000 0.441406250000 0.265625000000 0.464843750000
+w_tab_pushed_r.tga 0.472656250000 0.500000000000 0.476562500000 0.523437500000
+quit_button_pushed_m.tga 0.476562500000 0.500000000000 0.480468750000 0.523437500000
+w_header_m.tga 0.468750000000 0.531250000000 0.472656250000 0.554687500000
+r2_tab_wide_over_l.tga 0.464843750000 0.562500000000 0.468750000000 0.585937500000
+w_tab_up_normal_m.tga 0.519531250000 0.742187500000 0.523437500000 0.765625000000
+w_tab_down_normal_l.tga 0.523437500000 0.742187500000 0.527343750000 0.765625000000
+w_tab_up_normal_l.tga 0.527343750000 0.742187500000 0.531250000000 0.765625000000
+w_tab_down_normal_m.tga 0.531250000000 0.742187500000 0.535156250000 0.765625000000
+qh_off_m.tga 0.535156250000 0.742187500000 0.539062500000 0.765625000000
+r2_tab_wide_over_m.tga 0.539062500000 0.742187500000 0.542968750000 0.765625000000
+r2_tab_wide_over_r.tga 0.542968750000 0.742187500000 0.546875000000 0.765625000000
+w_tab_normal_l.tga 0.546875000000 0.742187500000 0.550781250000 0.765625000000
+w_tab_normal_m.tga 0.550781250000 0.742187500000 0.554687500000 0.765625000000
+w_tab_normal_r.tga 0.554687500000 0.742187500000 0.558593750000 0.765625000000
+qh_on_m.tga 0.558593750000 0.742187500000 0.562500000000 0.765625000000
+w_tab_over_l.tga 0.562500000000 0.742187500000 0.566406250000 0.765625000000
+w_tab_over_m.tga 0.566406250000 0.742187500000 0.570312500000 0.765625000000
+quit_button_normal_m.tga 0.570312500000 0.742187500000 0.574218750000 0.765625000000
+w_l0_tr_title.tga 0.574218750000 0.742187500000 0.578125000000 0.765625000000
+w_l0_t_title.tga 0.578125000000 0.742187500000 0.582031250000 0.765625000000
+w_tab_over_r.tga 0.582031250000 0.742187500000 0.585937500000 0.765625000000
+w_tab_pushed_l.tga 0.585937500000 0.742187500000 0.589843750000 0.765625000000
+W_ico_affected_fill.tga 0.171875000000 0.429687500000 0.177734375000 0.441406250000
+W_ico_affected.tga 0.992187500000 0.445312500000 0.998046875000 0.457031250000
+w_text_button_over_l.tga 0.988281250000 0.218750000000 0.992187500000 0.234375000000
+w_text_button_over_m.tga 0.121093750000 0.222656250000 0.125000000000 0.238281250000
+w_text_button_over_r.tga 0.148437500000 0.359375000000 0.152343750000 0.375000000000
+w_text_button_pushed_l.tga 0.460937500000 0.359375000000 0.464843750000 0.375000000000
+W_scale_more_3.tga 0.312500000000 0.273437500000 0.320312500000 0.281250000000
+w_text_button_pushed_m.tga 0.128906250000 0.414062500000 0.132812500000 0.429687500000
+w_text_button_pushed_r.tga 0.253906250000 0.480468750000 0.257812500000 0.496093750000
+r2ed_triggers_corner.tga 0.492187500000 0.273437500000 0.500000000000 0.281250000000
+r2ed_tool_border.tga 0.988281250000 0.304687500000 0.996093750000 0.312500000000
+W_L0_M_open.tga 0.089843750000 0.238281250000 0.105468750000 0.242187500000
+r2ed_tool_corner.tga 0.968750000000 0.343750000000 0.976562500000 0.351562500000
+r2ed_tool_corner_select.tga 0.992187500000 0.582031250000 1.000000000000 0.589843750000
+r2ed_tool_corner_select_g.tga 0.136718750000 0.593750000000 0.144531250000 0.601562500000
+W_L1_BL.tga 0.105468750000 0.238281250000 0.121093750000 0.242187500000
+W_L1_BL_open.tga 0.960937500000 0.386718750000 0.976562500000 0.390625000000
+W_L1_E_open.tga 0.328125000000 0.589843750000 0.343750000000 0.593750000000
+W_L2_BL.tga 0.117187500000 0.621093750000 0.132812500000 0.625000000000
+W_L2_BL_open.tga 0.746093750000 0.625000000000 0.761718750000 0.628906250000
+W_L2_E_open.tga 0.675781250000 0.667968750000 0.691406250000 0.671875000000
+W_L2_M_open.tga 0.589843750000 0.742187500000 0.605468750000 0.746093750000
+r2ed_tool_border_select.tga 0.144531250000 0.593750000000 0.152343750000 0.601562500000
+r2ed_tool_border_select_g.tga 0.519531250000 0.597656250000 0.527343750000 0.605468750000
+skin_l1_bl_open.tga 0.605468750000 0.742187500000 0.621093750000 0.746093750000
+W_point.tga 0.835937500000 0.605468750000 0.843750000000 0.613281250000
+W_button_08_over.tga 0.527343750000 0.613281250000 0.535156250000 0.621093750000
+skin_l1_e_open.tga 0.671875000000 0.742187500000 0.687500000000 0.746093750000
+W_close_3.tga 0.835937500000 0.613281250000 0.843750000000 0.621093750000
+cm_b.tga 0.527343750000 0.621093750000 0.535156250000 0.628906250000
+cm_bl.tga 0.882812500000 0.621093750000 0.890625000000 0.628906250000
+r2ed_island_border.tga 0.691406250000 0.628906250000 0.699218750000 0.636718750000
+W_hl_b.tga 0.882812500000 0.628906250000 0.890625000000 0.636718750000
+W_hl_bl.tga 0.691406250000 0.636718750000 0.699218750000 0.644531250000
+skin_sep_l.tga 0.808593750000 0.652343750000 0.816406250000 0.660156250000
+skin_sep_r.tga 0.808593750000 0.660156250000 0.816406250000 0.667968750000
+W_hl_br.tga 0.855468750000 0.667968750000 0.863281250000 0.675781250000
+skin_tl.tga 0.800781250000 0.675781250000 0.808593750000 0.683593750000
+skin_tr.tga 0.855468750000 0.675781250000 0.863281250000 0.683593750000
+W_hl_l.tga 0.800781250000 0.683593750000 0.808593750000 0.691406250000
+W_hl_r.tga 0.328125000000 0.695312500000 0.335937500000 0.703125000000
+W_hl_t.tga 0.691406250000 0.695312500000 0.699218750000 0.703125000000
+W_hl_tl.tga 0.328125000000 0.703125000000 0.335937500000 0.710937500000
+W_hl_tr.tga 0.722656250000 0.703125000000 0.730468750000 0.710937500000
+r2ed_island_corner.tga 0.785156250000 0.707031250000 0.792968750000 0.714843750000
+cm_br.tga 0.625000000000 0.710937500000 0.632812500000 0.718750000000
+cm_l.tga 0.722656250000 0.710937500000 0.730468750000 0.718750000000
+cm_link_hor.tga 0.785156250000 0.714843750000 0.792968750000 0.722656250000
+cm_link_vert.tga 0.746093750000 0.722656250000 0.753906250000 0.730468750000
+cm_m.tga 0.949218750000 0.742187500000 0.957031250000 0.750000000000
+cm_r.tga 0.957031250000 0.742187500000 0.964843750000 0.750000000000
+cm_t.tga 0.980468750000 0.742187500000 0.988281250000 0.750000000000
+cm_tl.tga 0.988281250000 0.742187500000 0.996093750000 0.750000000000
+cm_tr.tga 0.000000000000 0.746093750000 0.007812500000 0.753906250000
+compas_l.tga 0.250000000000 0.511718750000 0.253906250000 0.527343750000
+r2_icon_map_entity_small.tga 0.007812500000 0.746093750000 0.015625000000 0.753906250000
+r2_icon_map_entity_small_highlight.tga 0.015625000000 0.746093750000 0.023437500000 0.753906250000
+w_l0_lock.tga 0.023437500000 0.746093750000 0.031250000000 0.753906250000
+W_L1_M_open.tga 0.031250000000 0.746093750000 0.046875000000 0.750000000000
+compas_m.tga 0.996093750000 0.531250000000 1.000000000000 0.546875000000
+W_scale_less_3.tga 0.046875000000 0.746093750000 0.054687500000 0.753906250000
+r2_icon_map_invalid_small.tga 0.054687500000 0.746093750000 0.062500000000 0.753906250000
+skin_bl.tga 0.289062500000 0.746093750000 0.296875000000 0.753906250000
+W_arrow_down_3.tga 0.296875000000 0.746093750000 0.304687500000 0.753906250000
+compas_r.tga 0.230468750000 0.601562500000 0.234375000000 0.617187500000
+W_button_10_choice.tga 0.375000000000 0.746093750000 0.382812500000 0.753906250000
+skin_br.tga 0.382812500000 0.746093750000 0.390625000000 0.753906250000
+skin_br_open.tga 0.390625000000 0.746093750000 0.398437500000 0.753906250000
+W_arrow_right_3.tga 0.398437500000 0.746093750000 0.406250000000 0.753906250000
+skin_l1_m_open.tga 0.406250000000 0.746093750000 0.421875000000 0.750000000000
+r2ed_triggers_border.tga 0.421875000000 0.746093750000 0.429687500000 0.753906250000
+skin_l1_bl.tga 0.429687500000 0.746093750000 0.445312500000 0.750000000000
+W_arrow_up_3.tga 0.445312500000 0.746093750000 0.453125000000 0.753906250000
+skin_er_open.tga 0.453125000000 0.746093750000 0.460937500000 0.753906250000
+w_special_bl.tga 0.460937500000 0.746093750000 0.468750000000 0.753906250000
+w_special_blank.tga 0.589843750000 0.746093750000 0.597656250000 0.753906250000
+w_special_br.tga 0.597656250000 0.746093750000 0.605468750000 0.753906250000
+w_special_tr.tga 0.605468750000 0.746093750000 0.613281250000 0.753906250000
+w_text_button_normal_l.tga 0.671875000000 0.675781250000 0.675781250000 0.691406250000
+w_text_button_normal_m.tga 0.621093750000 0.742187500000 0.625000000000 0.757812500000
+W_L0_BL.tga 0.671875000000 0.746093750000 0.687500000000 0.750000000000
+W_L0_BL_open.tga 0.746093750000 0.746093750000 0.761718750000 0.750000000000
+w_text_button_normal_r.tga 0.613281250000 0.746093750000 0.617187500000 0.761718750000
+W_quantity.tga 0.886718750000 0.746093750000 0.892578125000 0.753906250000
+Numbers_sep.tga 0.964843750000 0.746093750000 0.969726562500 0.753906250000
+Numbers_0.tga 0.031250000000 0.750000000000 0.036132812500 0.757812500000
+Numbers_1.tga 0.039062500000 0.750000000000 0.043945312500 0.757812500000
+Numbers_2.tga 0.277343750000 0.750000000000 0.282226562500 0.757812500000
+Numbers_3.tga 0.406250000000 0.750000000000 0.411132812500 0.757812500000
+Numbers_4.tga 0.414062500000 0.750000000000 0.418945312500 0.757812500000
+Numbers_5.tga 0.429687500000 0.750000000000 0.434570312500 0.757812500000
+Numbers_6.tga 0.437500000000 0.750000000000 0.442382812500 0.757812500000
+Numbers_7.tga 0.625000000000 0.750000000000 0.629882812500 0.757812500000
+Numbers_8.tga 0.632812500000 0.750000000000 0.637695312500 0.757812500000
+Numbers_9.tga 0.640625000000 0.750000000000 0.645507812500 0.757812500000
+r2ed_island_corner_select.tga 0.648437500000 0.750000000000 0.654296875000 0.755859375000
+r2ed_island_border_select.tga 0.656250000000 0.750000000000 0.662109375000 0.755859375000
+typo_m.tga 0.664062500000 0.750000000000 0.669921875000 0.755859375000
+typo_q.tga 0.671875000000 0.750000000000 0.677734375000 0.755859375000
+typo_v.tga 0.679687500000 0.750000000000 0.685546875000 0.755859375000
+typo_w.tga 0.691406250000 0.750000000000 0.697265625000 0.755859375000
+typo_y.tga 0.699218750000 0.750000000000 0.705078125000 0.755859375000
+W_scroll_L123_M.tga 0.984375000000 0.390625000000 0.992187500000 0.394531250000
+skin_scroll_t.tga 0.546875000000 0.453125000000 0.554687500000 0.457031250000
+W_scroll_L123_T.tga 0.457031250000 0.582031250000 0.464843750000 0.585937500000
+skin_sep_m.tga 0.882812500000 0.636718750000 0.890625000000 0.640625000000
+Skin_scroll_R.tga 0.988281250000 0.117187500000 0.992187500000 0.125000000000
+w_scroll_m.tga 0.996093750000 0.304687500000 1.000000000000 0.312500000000
+w_scroll_r.tga 0.125000000000 0.492187500000 0.128906250000 0.500000000000
+w_special_b.tga 0.156250000000 0.500000000000 0.160156250000 0.507812500000
+w_special_l.tga 0.691406250000 0.644531250000 0.699218750000 0.648437500000
+w_special_r.tga 0.738281250000 0.648437500000 0.746093750000 0.652343750000
+w_special_t.tga 0.152343750000 0.562500000000 0.156250000000 0.570312500000
+Skin_scroll_L.tga 0.527343750000 0.597656250000 0.531250000000 0.605468750000
+skin_scroll_b.tga 0.855468750000 0.683593750000 0.863281250000 0.687500000000
+w_scroll_l.tga 0.250000000000 0.710937500000 0.253906250000 0.718750000000
+W_scroll_L0_B.tga 0.730468750000 0.687500000000 0.738281250000 0.691406250000
+W_scroll_L0_M.tga 0.484375000000 0.707031250000 0.492187500000 0.710937500000
+W_scroll_L0_T.tga 0.656250000000 0.718750000000 0.664062500000 0.722656250000
+W_scroll_L123_B.tga 0.722656250000 0.718750000000 0.730468750000 0.722656250000
+W_L0_EM_open.tga 0.246093750000 0.726562500000 0.250000000000 0.734375000000
+W_L0_ER_open.tga 0.898437500000 0.730468750000 0.902343750000 0.738281250000
+typo_6.tga 0.707031250000 0.750000000000 0.711914062500 0.755859375000
+typo_question.tga 0.714843750000 0.750000000000 0.719726562500 0.755859375000
+typo_r.tga 0.722656250000 0.750000000000 0.727539062500 0.755859375000
+typo_u.tga 0.730468750000 0.750000000000 0.735351562500 0.755859375000
+typo_7.tga 0.746093750000 0.750000000000 0.750976562500 0.755859375000
+typo_8.tga 0.753906250000 0.750000000000 0.758789062500 0.755859375000
+typo_x.tga 0.769531250000 0.750000000000 0.774414062500 0.755859375000
+typo_9.tga 0.777343750000 0.750000000000 0.782226562500 0.755859375000
+typo_a.tga 0.785156250000 0.750000000000 0.790039062500 0.755859375000
+typo_0.tga 0.792968750000 0.750000000000 0.797851562500 0.755859375000
+typo_2.tga 0.800781250000 0.750000000000 0.805664062500 0.755859375000
+typo_b.tga 0.808593750000 0.750000000000 0.813476562500 0.755859375000
+typo_3.tga 0.816406250000 0.750000000000 0.821289062500 0.755859375000
+typo_4.tga 0.824218750000 0.750000000000 0.829101562500 0.755859375000
+typo_d.tga 0.832031250000 0.750000000000 0.836914062500 0.755859375000
+typo_g.tga 0.839843750000 0.750000000000 0.844726562500 0.755859375000
+typo_h.tga 0.847656250000 0.750000000000 0.852539062500 0.755859375000
+typo_k.tga 0.855468750000 0.750000000000 0.860351562500 0.755859375000
+typo_5.tga 0.863281250000 0.750000000000 0.868164062500 0.755859375000
+typo_n.tga 0.871093750000 0.750000000000 0.875976562500 0.755859375000
+typo_o.tga 0.878906250000 0.750000000000 0.883789062500 0.755859375000
+typo_p.tga 0.894531250000 0.750000000000 0.899414062500 0.755859375000
+infos_top.tga 0.066406250000 0.722656250000 0.073242187500 0.726562500000
+infos_bot.tga 0.648437500000 0.734375000000 0.655273437500 0.738281250000
+infos_mid.tga 0.902343750000 0.750000000000 0.909179687500 0.753906250000
+w_radar_point.tga 0.910156250000 0.750000000000 0.915039062500 0.754882812500
+bulle_tr.tga 0.917968750000 0.750000000000 0.922851562500 0.754882812500
+bulle_bl.tga 0.925781250000 0.750000000000 0.930664062500 0.754882812500
+bulle_br.tga 0.933593750000 0.750000000000 0.938476562500 0.754882812500
+bulle_tl.tga 0.949218750000 0.750000000000 0.954101562500 0.754882812500
+typo_l.tga 0.062500000000 0.734375000000 0.066406250000 0.740234375000
+typo_s.tga 0.617187500000 0.746093750000 0.621093750000 0.751953125000
+typo_t.tga 0.972656250000 0.746093750000 0.976562500000 0.751953125000
+typo_f.tga 0.285156250000 0.750000000000 0.289062500000 0.755859375000
+typo_c.tga 0.941406250000 0.750000000000 0.945312500000 0.755859375000
+typo_1.tga 0.957031250000 0.750000000000 0.960937500000 0.755859375000
+typo_i.tga 0.960937500000 0.750000000000 0.964843750000 0.755859375000
+typo_j.tga 0.980468750000 0.750000000000 0.984375000000 0.755859375000
+typo_z.tga 0.984375000000 0.750000000000 0.988281250000 0.755859375000
+typo_e.tga 0.988281250000 0.750000000000 0.992187500000 0.755859375000
+W_L1_L.tga 0.121093750000 0.238281250000 0.125000000000 0.242187500000
+W_L1_R.tga 0.351562500000 0.457031250000 0.355468750000 0.460937500000
+W_L1_T.tga 0.347656250000 0.496093750000 0.351562500000 0.500000000000
+W_L1_TL.tga 0.156250000000 0.507812500000 0.160156250000 0.511718750000
+W_L1_TR.tga 0.343750000000 0.527343750000 0.347656250000 0.531250000000
+W_L2_B.tga 0.996093750000 0.546875000000 1.000000000000 0.550781250000
+W_box_bot.tga 0.152343750000 0.570312500000 0.156250000000 0.574218750000
+w_l2_blank.tga 0.230468750000 0.617187500000 0.234375000000 0.621093750000
+W_box_bot_left.tga 0.132812500000 0.621093750000 0.136718750000 0.625000000000
+W_L2_BR.tga 0.761718750000 0.625000000000 0.765625000000 0.628906250000
+W_L2_BR_open.tga 0.964843750000 0.710937500000 0.968750000000 0.714843750000
+W_L2_B_open.tga 0.074218750000 0.722656250000 0.078125000000 0.726562500000
+r2ed_dismatch_filter.tga 0.671875000000 0.722656250000 0.675781250000 0.726562500000
+W_L2_L.tga 0.894531250000 0.746093750000 0.898437500000 0.750000000000
+W_box_bot_right.tga 0.992187500000 0.750000000000 0.996093750000 0.753906250000
+W_L2_R.tga 0.996093750000 0.750000000000 1.000000000000 0.753906250000
+W_L2_T.tga 0.000000000000 0.753906250000 0.003906250000 0.757812500000
+W_L2_TL.tga 0.003906250000 0.753906250000 0.007812500000 0.757812500000
+W_L2_TR.tga 0.007812500000 0.753906250000 0.011718750000 0.757812500000
+W_box_left.tga 0.011718750000 0.753906250000 0.015625000000 0.757812500000
+W_box_right.tga 0.015625000000 0.753906250000 0.019531250000 0.757812500000
+W_box_top.tga 0.019531250000 0.753906250000 0.023437500000 0.757812500000
+W_box_top_left.tga 0.023437500000 0.753906250000 0.027343750000 0.757812500000
+W_box_top_right.tga 0.027343750000 0.753906250000 0.031250000000 0.757812500000
+alpha_50.tga 0.046875000000 0.753906250000 0.050781250000 0.757812500000
+skin_l1_l.tga 0.050781250000 0.753906250000 0.054687500000 0.757812500000
+fame_bar_3d.tga 0.054687500000 0.753906250000 0.055664062500 0.769531250000
+skin_l1_r.tga 0.058593750000 0.753906250000 0.062500000000 0.757812500000
+blank.tga 0.062500000000 0.753906250000 0.066406250000 0.757812500000
+blank2.tga 0.066406250000 0.753906250000 0.070312500000 0.757812500000
+skin_l1_t.tga 0.070312500000 0.753906250000 0.074218750000 0.757812500000
+skin_l1_tl.tga 0.074218750000 0.753906250000 0.078125000000 0.757812500000
+alpha_60.tga 0.078125000000 0.753906250000 0.082031250000 0.757812500000
+skin_l2_r.tga 0.082031250000 0.753906250000 0.085937500000 0.757812500000
+skin_l3_r.tga 0.085937500000 0.753906250000 0.089843750000 0.757812500000
+skin_modal_b.tga 0.089843750000 0.753906250000 0.093750000000 0.757812500000
+w_hl_bl_l123.tga 0.093750000000 0.753906250000 0.097656250000 0.757812500000
+skin_modal_bl.tga 0.097656250000 0.753906250000 0.101562500000 0.757812500000
+w_hl_br_l123.tga 0.101562500000 0.753906250000 0.105468750000 0.757812500000
+w_hl_b_l123.tga 0.105468750000 0.753906250000 0.109375000000 0.757812500000
+skin_modal_br.tga 0.109375000000 0.753906250000 0.113281250000 0.757812500000
+w_hl_l_l123.tga 0.113281250000 0.753906250000 0.117187500000 0.757812500000
+skin_modal_l.tga 0.117187500000 0.753906250000 0.121093750000 0.757812500000
+w_hl_r_l123.tga 0.121093750000 0.753906250000 0.125000000000 0.757812500000
+skin_modal_r.tga 0.125000000000 0.753906250000 0.128906250000 0.757812500000
+skin_modal_t.tga 0.128906250000 0.753906250000 0.132812500000 0.757812500000
+w_hl_tl_l123.tga 0.132812500000 0.753906250000 0.136718750000 0.757812500000
+skin_modal_tl.tga 0.136718750000 0.753906250000 0.140625000000 0.757812500000
+w_hl_tr_l123.tga 0.140625000000 0.753906250000 0.144531250000 0.757812500000
+skin_modal_tr.tga 0.144531250000 0.753906250000 0.148437500000 0.757812500000
+alpha_70.tga 0.148437500000 0.753906250000 0.152343750000 0.757812500000
+alpha_80.tga 0.152343750000 0.753906250000 0.156250000000 0.757812500000
+W_L3_BL.tga 0.156250000000 0.753906250000 0.160156250000 0.757812500000
+w_l3_blank.tga 0.160156250000 0.753906250000 0.164062500000 0.757812500000
+W_L3_BR.tga 0.164062500000 0.753906250000 0.167968750000 0.757812500000
+W_L3_L.tga 0.167968750000 0.753906250000 0.171875000000 0.757812500000
+W_L3_R.tga 0.289062500000 0.753906250000 0.292968750000 0.757812500000
+W_L3_T.tga 0.292968750000 0.753906250000 0.296875000000 0.757812500000
+W_L3_TL.tga 0.296875000000 0.753906250000 0.300781250000 0.757812500000
+W_L3_TR.tga 0.300781250000 0.753906250000 0.304687500000 0.757812500000
+grey_0.tga 0.316406250000 0.753906250000 0.320312500000 0.757812500000
+r2ed_triggers_gray.tga 0.320312500000 0.753906250000 0.324218750000 0.757812500000
+W_modal_B.tga 0.324218750000 0.753906250000 0.328125000000 0.757812500000
+W_modal_BL.tga 0.328125000000 0.753906250000 0.332031250000 0.757812500000
+W_modal_blank.tga 0.332031250000 0.753906250000 0.335937500000 0.757812500000
+W_modal_BR.tga 0.335937500000 0.753906250000 0.339843750000 0.757812500000
+W_modal_L.tga 0.339843750000 0.753906250000 0.343750000000 0.757812500000
+W_modal_R.tga 0.343750000000 0.753906250000 0.347656250000 0.757812500000
+W_modal_T.tga 0.347656250000 0.753906250000 0.351562500000 0.757812500000
+W_modal_TL.tga 0.351562500000 0.753906250000 0.355468750000 0.757812500000
+W_modal_TR.tga 0.355468750000 0.753906250000 0.359375000000 0.757812500000
+grey_10.tga 0.359375000000 0.753906250000 0.363281250000 0.757812500000
+grey_100.tga 0.363281250000 0.753906250000 0.367187500000 0.757812500000
+grey_20.tga 0.367187500000 0.753906250000 0.371093750000 0.757812500000
+grey_30.tga 0.371093750000 0.753906250000 0.375000000000 0.757812500000
+grey_40.tga 0.375000000000 0.753906250000 0.378906250000 0.757812500000
+grey_50.tga 0.378906250000 0.753906250000 0.382812500000 0.757812500000
+grey_60.tga 0.382812500000 0.753906250000 0.386718750000 0.757812500000
+grey_70.tga 0.386718750000 0.753906250000 0.390625000000 0.757812500000
+w_hl_t_l123.tga 0.390625000000 0.753906250000 0.394531250000 0.757812500000
+grey_80.tga 0.394531250000 0.753906250000 0.398437500000 0.757812500000
+grey_90.tga 0.398437500000 0.753906250000 0.402343750000 0.757812500000
+W_L3_B.tga 0.402343750000 0.753906250000 0.406250000000 0.757812500000
+r2ed_triggers_blank.tga 0.421875000000 0.753906250000 0.425781250000 0.757812500000
+alpha_10.tga 0.425781250000 0.753906250000 0.429687500000 0.757812500000
+skin_l1_b.tga 0.445312500000 0.753906250000 0.449218750000 0.757812500000
+alpha_20.tga 0.449218750000 0.753906250000 0.453125000000 0.757812500000
+w_l0_l_over.tga 0.453125000000 0.753906250000 0.457031250000 0.757812500000
+r2ed_triggers_little_border.tga 0.457031250000 0.753906250000 0.460937500000 0.757812500000
+r2ed_little_island_border_select.tga 0.460937500000 0.753906250000 0.464843750000 0.757812500000
+r2ed_triggers_little_corner.tga 0.464843750000 0.753906250000 0.468750000000 0.757812500000
+W_L0_R.tga 0.468750000000 0.753906250000 0.472656250000 0.757812500000
+w_l0_r_over.tga 0.472656250000 0.753906250000 0.476562500000 0.757812500000
+W_L0_T.tga 0.476562500000 0.753906250000 0.480468750000 0.757812500000
+W_L0_TL.tga 0.484375000000 0.753906250000 0.488281250000 0.757812500000
+w_l0_tl_over.tga 0.488281250000 0.753906250000 0.492187500000 0.757812500000
+r2ed_little_island_corner_select.tga 0.492187500000 0.753906250000 0.496093750000 0.757812500000
+W_L0_TR.tga 0.496093750000 0.753906250000 0.500000000000 0.757812500000
+w_l0_tr_over.tga 0.500000000000 0.753906250000 0.503906250000 0.757812500000
+alpha_30.tga 0.503906250000 0.753906250000 0.507812500000 0.757812500000
+w_l0_t_over.tga 0.507812500000 0.753906250000 0.511718750000 0.757812500000
+alpha_40.tga 0.511718750000 0.753906250000 0.515625000000 0.757812500000
+W_L123_blank.tga 0.515625000000 0.753906250000 0.519531250000 0.757812500000
+W_L1_B.tga 0.589843750000 0.753906250000 0.593750000000 0.757812500000
+r2ed_tool_bg.tga 0.593750000000 0.753906250000 0.597656250000 0.757812500000
+w_l1_blank.tga 0.597656250000 0.753906250000 0.601562500000 0.757812500000
+W_L0_B.tga 0.601562500000 0.753906250000 0.605468750000 0.757812500000
+skin_l1_b_open.tga 0.605468750000 0.753906250000 0.609375000000 0.757812500000
+W_L0_blank.tga 0.609375000000 0.753906250000 0.613281250000 0.757812500000
+W_L1_BR.tga 0.617187500000 0.753906250000 0.621093750000 0.757812500000
+w_l0_bl_over.tga 0.886718750000 0.753906250000 0.890625000000 0.757812500000
+W_L0_BR.tga 0.890625000000 0.753906250000 0.894531250000 0.757812500000
+W_L0_BR_open.tga 0.902343750000 0.753906250000 0.906250000000 0.757812500000
+w_l0_br_over.tga 0.906250000000 0.753906250000 0.910156250000 0.757812500000
+W_L0_B_open.tga 0.964843750000 0.753906250000 0.968750000000 0.757812500000
+w_l0_b_over.tga 0.968750000000 0.753906250000 0.972656250000 0.757812500000
+W_L1_BR_open.tga 0.972656250000 0.753906250000 0.976562500000 0.757812500000
+W_L1_B_open.tga 0.992187500000 0.753906250000 0.996093750000 0.757812500000
+W_box_blank.tga 0.996093750000 0.753906250000 1.000000000000 0.757812500000
+W_L0_L.tga 0.000000000000 0.757812500000 0.003906250000 0.761718750000
+w_jauge_fill_tmin.tga 0.003906250000 0.757812500000 0.004882812500 0.767578125000
+bulle_l.tga 0.007812500000 0.757812500000 0.012695312500 0.759765625000
+bulle_t.tga 0.015625000000 0.757812500000 0.017578125000 0.762695312500
+bulle_r.tga 0.019531250000 0.757812500000 0.024414062500 0.759765625000
+bulle_b.tga 0.027343750000 0.757812500000 0.029296875000 0.762695312500
+w_line_hor3.tga 0.031250000000 0.757812500000 0.033203125000 0.761718750000
+r2_map_zone_edge.tga 0.035156250000 0.757812500000 0.037109375000 0.760742187500
+w_l1_r_spe.tga 0.039062500000 0.757812500000 0.042968750000 0.758789062500
+bulle_m.tga 0.042968750000 0.757812500000 0.044921875000 0.759765625000
+w_l1_spe_blank.tga 0.046875000000 0.757812500000 0.050781250000 0.758789062500
+skin_l1_spe_blank.tga 0.050781250000 0.757812500000 0.054687500000 0.758789062500
+text_cursor.tga 0.058593750000 0.757812500000 0.060546875000 0.759765625000
+jauge_fill.tga 0.062500000000 0.757812500000 0.063476562500 0.761718750000
+W_jauge_fill.tga 0.066406250000 0.757812500000 0.067382812500 0.761718750000
+W_line_hor.tga 0.070312500000 0.757812500000 0.072265625000 0.759765625000
+w_line_hor2.tga 0.074218750000 0.757812500000 0.076171875000 0.759765625000
+skin_l1_r_spe.tga 0.078125000000 0.757812500000 0.082031250000 0.758789062500
+W_line_ver.tga 0.082031250000 0.757812500000 0.083984375000 0.759765625000
+W_jauge_fill_mini.tga 0.085937500000 0.757812500000 0.086914062500 0.759765625000
+w_jauge_fill_umin.tga 0.089843750000 0.757812500000 0.090820312500 0.759765625000
+no_bord.tga 0.093750000000 0.757812500000 0.094726562500 0.758789062500
+r2ed_tool_draw_road_base.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_icon_components_chest.tga 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_instance_link.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+instance_link.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_region.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_road_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_region_vertex.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_road_flag.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_entity_count_too_high.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_entity_place_holder.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_road.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_region_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_split_road_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+road_flag.max 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+road_flag.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
new file mode 100644
index 000000000..9b88c02f7
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
@@ -0,0 +1,190 @@
+
+-- create the webig namespace without reseting if already created in an other file.
+if (webig==nil) then
+	webig= {}
+end
+
+if (webig.sheetLists==nil) then
+	webig.sheetLists = {}
+end
+
+
+function webig:addSheet(dst, sheet, quality, quantity, worned, user_color, rm_class_type, rm_faber_stat_type)
+	if quality == nil then quality=0 end
+	if quantity == nil then quantity=0 end
+	if worned == nil then worned=0 end
+	if user_color == nil then user_color=0 end
+	if rm_class_type == nil then rm_class_type=0 end
+	if rm_faber_stat_type == nil then rm_faber_stat_type=0 end
+	addDbProp(dst..":SHEET", sheet)
+	addDbProp(dst..":WORNED", worned)
+	addDbProp(dst..":QUALITY", quality)
+	addDbProp(dst..":QUANTITY", quantity)
+	addDbProp(dst..":USER_COLOR", user_color)
+	addDbProp(dst..":RM_CLASS_TYPE", rm_class_type)
+	addDbProp(dst..":RM_FABER_STAT_TYPE", rm_faber_stat_type)
+end
+
+function webig:cleanSheets(db)
+	delDbProp(db)
+end
+
+function webig:addSheetList(name, ctrl, db, size)
+	webig.sheetLists[name] = {}
+	webig.sheetLists[name].ctrl = ctrl
+	webig.sheetLists[name].db = db
+	webig.sheetLists[name].selection = ""
+	webig.sheetLists[name].size = size
+end
+
+function webig:copyItems(src, dst)
+	addDbProp(dst..":SHEET", getDbProp(src..":SHEET"))
+	addDbProp(dst..":WORNED", getDbProp(src..":WORNED"))
+	addDbProp(dst..":QUALITY", getDbProp(src..":QUALITY"))
+	addDbProp(dst..":QUANTITY", getDbProp(src..":QUANTITY"))
+	addDbProp(dst..":USER_COLOR", getDbProp(src..":USER_COLOR"))
+	addDbProp(dst..":RM_CLASS_TYPE", getDbProp(src..":RM_CLASS_TYPE"))
+	addDbProp(dst..":RM_FABER_STAT_TYPE", getDbProp(src..":RM_FABER_STAT_TYPE"))
+end
+
+function webig:swapItems(src, dst)
+	local sheet = getDbProp(dst..":SHEET")
+	local worned = getDbProp(dst..":WORNED")
+	local quality = getDbProp(dst..":QUALITY")
+	local quantity = getDbProp(dst..":QUANTITY")
+	local user_color = getDbProp(dst..":USER_COLOR")
+	local rm_class_type = getDbProp(dst..":RM_CLASS_TYPE")
+	local rm_faber_stat_type = getDbProp(dst..":RM_FABER_STAT_TYPE")
+
+	addDbProp(dst..":SHEET", getDbProp(src..":SHEET"))
+	addDbProp(dst..":WORNED", getDbProp(src..":WORNED"))	
+	addDbProp(dst..":QUALITY", getDbProp(src..":QUALITY"))
+	addDbProp(dst..":QUANTITY", getDbProp(src..":QUANTITY"))
+	addDbProp(dst..":USER_COLOR", getDbProp(src..":USER_COLOR"))
+	addDbProp(dst..":RM_CLASS_TYPE", getDbProp(src..":RM_CLASS_TYPE"))
+	addDbProp(dst..":RM_FABER_STAT_TYPE", getDbProp(src..":RM_FABER_STAT_TYPE"))
+	
+	addDbProp(src..":SHEET", sheet)
+	addDbProp(src..":WORNED", worned)
+	addDbProp(src..":QUALITY", quality)
+	addDbProp(src..":QUANTITY", quantity)
+	addDbProp(src..":USER_COLOR", user_color)
+	addDbProp(src..":RM_CLASS_TYPE", rm_class_type)
+	addDbProp(src..":RM_FABER_STAT_TYPE", rm_faber_stat_type)
+end
+
+function webig:deleteItem(src)
+	addDbProp(src..":SHEET", 0)
+	addDbProp(src..":WORNED", 0)
+	addDbProp(src..":QUALITY", 0)
+	addDbProp(src..":QUANTITY", 0)
+	addDbProp(src..":USER_COLOR", 0)
+	addDbProp(src..":RM_CLASS_TYPE", 0)
+	addDbProp(src..":RM_FABER_STAT_TYPE", 0)
+end
+
+function webig:paramDbSheetSlot(sheet_list, ctrl)
+	local ctrlSheet = webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl)
+	if ctrlSheet ~= nil then
+		ctrlSheet.left_click="lua"
+		ctrlSheet.left_click_params="webig:addOrRemoveDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\')"
+		ctrlSheet.dragable=true
+		ctrlSheet.can_drop=true
+		ctrlSheet.on_drop="lua"
+		ctrlSheet.on_drop_params="webig:dropDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\', \'%src\')"
+		ctrlSheet.on_can_drop="lua"
+		ctrlSheet.on_can_drop_params="webig:canDropDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\', \'%src\')"
+	end
+end
+
+function webig:paramDbSheetSelect(sheet_list, ctrl, lua_function)
+	local ctrlSheet = webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl)
+	if ctrlSheet ~= nil then
+		ctrlSheet.left_click="lua"
+		ctrlSheet.left_click_params=lua_function.."(\'"..sheet_list.."\', \'"..ctrl.."\')"
+		ctrlSheet.dragable=false
+		ctrlSheet.can_drop=false
+	end
+end
+
+function webig:canDropDbSheet(sheet_list, ctrl, src)
+	webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl).can_drop=true
+end
+
+function webig:dropDbSheet(sheet_list, ctrl, src)
+ 	local db = webig.sheetLists[sheet_list].db
+ 	local sl_id = webig.sheetLists[sheet_list].ctrl.id
+ 	if (string.sub(src, 1, string.len(sl_id)) == sl_id) then -- copy from same list sheet
+		local pos=nil
+		for i=1, string.len(src) do
+			if string.sub(src, i, i) == ":" then
+				pos = i+1
+			end
+		end
+		id = string.sub(src, pos, string.len(src))
+		webig:swapItems(db..":"..id, db..":"..ctrl)
+ 	else
+		slot = getUI(src)
+		if slot ~= nil then
+			id = findReplaceAll(src, slot.parent.id..":", "")
+			webig:copyItems("LOCAL:INVENTORY:BAG:"..id, db..":"..ctrl)
+		end
+	end
+end
+
+
+function webig:addOrRemoveDbSheet(sheet_list, ctrl)
+ 	local db = webig.sheetLists[sheet_list].db
+	if getDbProp(db..":"..ctrl..":SHEET") == 0 then -- Add item
+		webig:AddDbSheet(sheet_list, ctrl)
+	else
+		webig:removeDbSheetQuantity(sheet_list, ctrl)
+	end
+end
+
+function webig:AddDbSheet(sheet_list, ctrl)
+	runAH(nil, "enter_modal", "group=ui:interface:webig_html_modal")
+	local whm = getUI("ui:interface:webig_html_modal")
+	whm.child_resize_h=false
+	whm.h = 44*webig.sheetLists[sheet_list].size
+	whm.w = 224
+	whm = getUI("ui:interface:webig_html_modal:html")
+	if whm ~= nil then
+		whm:refresh() -- url need be setted before
+	end
+	webig.sheetLists[sheet_list].selection = ctrl
+end
+
+function webig:removeDbSheetQuantity(sheet_list, ctrl)
+ 	local db = webig.sheetLists[sheet_list].db
+ 	webig:copyItems(db..":"..ctrl, "UI:DROP_DESTROY_ITEM:ITEM")
+	runAH(nil, "set_keyboard_focus", "select_all=true|target=ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb")
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:ok_cancel:ok").onclick_l="lua"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:ok_cancel:ok").params_l="webig:doRemoveDbSheetQuantity(\'"..sheet_list.."\', \'"..ctrl.."\')"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").on_enter="lua"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").on_enter_params="webig:doRemoveDbSheetQuantity(\'"..sheet_list.."\', \'"..ctrl.."\')"
+	runAH(nil, "enter_modal", "group=ui:interface:webig_drop_destroy_item_quantity_modal")
+	setDbProp("UI:DROP_DESTROY_ITEM:ITEM:QUANTITY", getDbProp(db..":"..ctrl..":QUANTITY"))
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").input_string=tostring(getDbProp(db..":"..ctrl..":QUANTITY"))
+end
+
+function webig:doRemoveDbSheetQuantity(sheet_list, ctrl)
+	local db = webig.sheetLists[sheet_list].db
+	runAH(nil, "leave_modal", "group=ui:interface:webig_drop_destroy_item_quantity_modal")
+	local new_quantity = tonumber(getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").input_string)
+	local current_quantity = getDbProp(db..":"..ctrl..":QUANTITY")
+	if new_quantity >= current_quantity then
+		webig:deleteItem(db..":"..ctrl)
+	else
+		addDbProp(db..":"..ctrl..":QUANTITY", current_quantity-new_quantity)
+	end
+end
+
+--assert(nil, "RELOADABLE SCRIPT");
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
new file mode 100644
index 000000000..3c1470485
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
@@ -0,0 +1,120 @@
+<!-- ****************************************** -->
+<!-- *            WEBIG WIDGETS               * -->
+<!-- ****************************************** -->
+<interface_config>
+	<root id="interface" x="0" y="0" w="800" h="600" active="true" />
+	<lua file="webig.lua" />
+
+<!-- //////////// STYLE : webigchat_desc /////////// -->
+	<style style="webigchat_desc" type="text" fontsize="12" justification="dont_clip_word" color="0 0 0 255" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" />
+<!-- //////////// STYLE : webigchat_option /////////// -->
+	<style style="webigchat_option" type="text" format_taged="true" fontsize="10" justification="dont_clip_word" color="0 0 64 255" underlined="true" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" />
+<!-- //////////// STYLE : webigchat_option_but /////////// -->
+	<style style="webigchat_option_but" type="button_link" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0" onclick_l="proc" params_l="proc_browse_faq" />
+	
+<!-- //////////// TEMPLATE : webig_3dbulle_L /////////// -->
+	<template name="webig_3dbulle_L" id="" keep="true">
+		<group id="#id" type="in_scene_bubble" header_active="false" options="no_bordure" openable="false" savable="false" resizer="true" movable="false" right_button="false" opened="true" child_resize_w="true" w="0" max_w="512" min_w="48" child_resize_h="true" in_scene_offset_x="-95" win_priority="%win_priority_world_space" posref="BL BR" use_cursor="true">
+			<group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="512" min_w="48" max_h="256" min_h="48" posref="TL TL">
+				<group id="window" x="0" y="0" child_resize_w="true" child_resize_wmargin="10" child_resize_h="true" child_resize_hmargin="10" posref="TL TL">
+					<group id="back" x="0" y="0" w="0" h="0" sizeref="wh" posref="TL TL">
+						<view type="bitmap" id="win_M" posref="MM MM" scale="true" sizeref="wh" w="-10" h="-10" texture="Bulle_M.tga" global_color="false" />
+						<view type="bitmap" id="win_T" posparent="win_M" posref="TL BL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_T.tga" global_color="false" />
+						<view type="bitmap" id="win_B" posparent="win_M" posref="BL TL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_B.tga" global_color="false" />
+						<view type="bitmap" id="win_L" posparent="win_M" posref="TL TR" scale="true" sizeref="h" w="5" h="0" texture="Bulle_L.tga" global_color="false" />
+						<view type="bitmap" id="win_R" posparent="win_M" posref="TR TL" scale="true" sizeref="h" w="5" h="0" texture="Bulle_R.tga" global_color="false" />
+						<view type="bitmap" id="win_TL" posref="TL TL" texture="Bulle_TL.tga" global_color="false" />
+						<view type="bitmap" id="win_TR" posref="TR TR" texture="Bulle_TR.tga" global_color="false" />
+						<view type="bitmap" id="win_BL" posref="BL BL" texture="Bulle_BL.tga" global_color="false" />
+						<view type="bitmap" id="win_BR" posref="BR BR" texture="Bulle_BR.tga" global_color="false" />
+					</group>
+					<view style="webigchat_desc" id="text" posref="TL TL" x="5" y="-24" />
+					<ctrl type="button" button_type="push_button" tx_normal="Bulle_next.tga" tx_pushed="Bulle_next.tga" tx_over="Bulle_next.tga" color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255" global_color_normal="false" global_color_over="false" global_color_pushed="false" tooltip="uiNext" id="but_next" posref="TR TR" x="-5" y="-5" onclick_l="bubble_next" active="false" />
+					<ctrl type="button" button_type="push_button" tx_normal="Bulle_quit.tga" tx_pushed="Bulle_quit.tga" tx_over="Bulle_quit.tga" color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255" global_color_normal="false" global_color_over="false" global_color_pushed="false" tooltip="uiSkip" id="but_skip" posref="TL TR" posparent="but_next" x="-4" y="0" onclick_l="bubble_skip" active="false" />
+					<!-- Yoyo: Fake to have minimum bubble size -->
+					<group id="min_w" posparent="text" posref="TL TL" x="0" y="0" w="48" h="14" />
+					<view style="webigchat_option" id="opt0" posparent="text" posref="BL TL" x="16" y="-4" />
+					<view style="webigchat_option" id="opt1" posparent="opt0" posref="BL TL" x="0" y="-4" /> 
+					<view style="webigchat_option" id="opt2" posparent="opt1" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt3" posparent="opt2" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt4" posparent="opt3" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt5" posparent="opt4" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt6" posparent="opt5" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt7" posparent="opt6" posref="BL TL" x="0" y="-5" />
+					<ctrl style="webigchat_option_but" id="optb0" posparent="opt0" params_l="0" />
+					<ctrl style="webigchat_option_but" id="optb1" posparent="opt1" params_l="1" />
+					<ctrl style="webigchat_option_but" id="optb2" posparent="opt2" params_l="2" />
+					<ctrl style="webigchat_option_but" id="optb3" posparent="opt3" params_l="3" />
+					<ctrl style="webigchat_option_but" id="optb4" posparent="opt4" params_l="4" />
+					<ctrl style="webigchat_option_but" id="optb5" posparent="opt5" params_l="5" />
+					<ctrl style="webigchat_option_but" id="optb6" posparent="opt6" params_l="6" />
+					<ctrl style="webigchat_option_but" id="optb7" posparent="opt7" params_l="7" />
+				</group>				
+				<view type="bitmap" id="win_talk" posref="BR TR" x="-24" y="2" posparent="window" texture="Bulle_Say_L.tga" global_color="false" />
+			</group>
+		</group>
+	</template>
+	
+<!-- //////////// TEMPLATE : webig_modal /////////// -->
+	<group type="modal" id="webig_html_modal" w="360" posref="TL TL"  child_resize_hmargin="8" child_resize_h="true" x="0" y="0" active="false" options="skin_modal" escapable="true" global_color="true">
+		<group id="html" type="html" posref="MM MM" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+			<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+			<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+			<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+			<ctrl style="skin_scroll" id="scroll_bar" />
+		</group>
+	</group>
+  
+<!-- //////////// MODAL : webig_exchange_choose_in_bag /////////// -->
+	<group type="modal" id="webig_exchange_choose_in_bag" w="360" child_resize_hmargin="8" child_resize_h="true" x="0" y="0" active="false" options="skin_modal" escapable="true" global_color="true">
+		<view type="text" id="title" posref="TL TL" x="6" y="-8" color="255 255 255 255" global_color="false" fontsize="10" shadow="true" hardtext="uiBCTitleMPItemType"/>
+		<group type="list_sheet" id="list" nature="item" posref="TL TL" x="4" y="-20" value="UI:VARIABLES:BOTCHAT:FILTER_ITEM_TYPE_SELECTED" force_item_background_generic="true" wspace="2" hspace="2" array="false" w="350" lmargin="0" rmargin="0" tmargin="2" bmargin="2" child_resize_h="true" onclick_l="confirm_change_botchat_buy_filter_item_type" on_tooltip="botchat_tt_item_type" use_quantity="false" use_quality="false" display_empty_slot="true"/>
+		<view type="text" id="no_filter" posparent="ctrl" posref="TL MM" x="24" y="-46" fontsize="12" shadow="true" case_mode="%case_upper" global_color="false" hardtext="uiBCNoItemTypeFilter"/>
+	</group>
+	
+<!-- //////////// MODAL : webig_drop_destroy_item_quantity_modal /////////// -->	
+	<group type="modal" id="webig_drop_destroy_item_quantity_modal" exit_click_out="true" posref="TL TL" w="180" h="80" x="-8" y="8" options="skin_modal">
+		<ctrl type="sheet" id="sheet" value="UI:DROP_DESTROY_ITEM:ITEM" posparent="parent" posref="MM MM" x="-26" y="0"/>
+		<view type="text" id="x" posparent="sheet" posref="MR MM" x="8" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="X"/>
+		<instance template="edit_box_widget" entry_type="positive_integer" id="edit" text_ref="TR TR" text_y="-1" fontsize="12" posparent="sheet" posref="MR ML" x="16" text_x="-2" w="32" prompt="" enter_loose_focus="false" multi_line="false" max_num_chars="3" onchange="editbox_number" onchange_params="value=UI:DROP_DESTROY_ITEM:ITEM:QUANTITY|update_text=false" onenter="proc" params="webig_drop_destroy_item_quantity_modal_ok" max_historic="0"/>
+		<instance template="button_ok_cancel" posref="BR BR" x="-4" y="4" onclick_ok="" onclick_ok_param="" onclick_cancel="leave_modal" onclick_cancel_param=""/>
+		<link expr="eq(@UI:DROP_DESTROY_ITEM:DROP_MODE,1)" target="drop_text:active"/>
+		<link expr="ne(@UI:DROP_DESTROY_ITEM:DROP_MODE,1)" target="destroy_text:active"/>
+	</group>
+
+<!-- //////////// TEMPLATE : webig_list_sheet /////////// -->	
+	<template name="webig_list_sheet" keep="true" db="" w="200" y="-10" x="10">
+		<group id="list_group" w="#w" y="#y" x="#x" posref="TL TL" child_resize_h="true" >
+			<group type="list_sheet" nature="item" id="list" posref="TL TL" x="0" y="0" child_resize_h="true" wspace="8" hspace="8" value="#db" array="true" auto_grayed="true" onclick_r="open_item_help" tooltip="uittSelectMp" />
+		</group>
+	</template>
+ 
+ <!-- //////////// TEMPLATE : webig_frame_borderless /////////// -->	
+	<template name="webig_frame_borderless" keep="true" w="200" h="200" x="0" y="0" movable="true">
+		<group id="content" w="#w" h="#h" x="#x" y="#y" posref="MM MM" >
+			<group id="html" type="html" posref="TL TL" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+				<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+				<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+				<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+				<ctrl style="skin_scroll" id="scroll_bar" />
+			</group>
+		</group>
+	</template>
+	
+<!-- //////////// TEMPLATE : webig_frame_skin_modal /////////// -->	
+	<template name="webig_frame_skin_modal" keep="true"  w="200" h="200" x="0" y="0">
+		<group id="group" type="container" active="true" w="#w" h="#h" x="#x" y="#y" posref="MM MM" options="skin_modal"  opened="true" openable="true" movable="true" header_color="UI:SAVE:WIN:COLORS:COM">
+			<group id="header_closed" x="0" y="0" w="#w" h="16" posref="TL TL"></group>
+			<group id="header_opened" x="0" y="0" w="#w" h="16" posref="TL TL"></group>
+			<group id="content" x="0" y="0" w="0" h="0" posref="TL TL ">
+				<group id="html" type="html" posref="MM MM" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+					<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+					<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+					<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+					<ctrl style="skin_scroll" id="scroll_bar" />
+				</group>
+			</group>
+		</group>
+	</template>
+ 
+</interface_config>
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index c0e6d1104..2d5076b90 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -1878,6 +1878,8 @@ void CCharacterCL::updateVisualPropertyPvpClan(const NLMISC::TGameCycle &/* game
 {
 	_LeagueId = uint32(prop);
 
+	buildInSceneInterface();
+
 	if (isUser())
 	{
 		uint i;
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 54a3d9b45..e0ed33abe 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -1347,6 +1347,7 @@ void CClientConfig::setValues()
 				if (stricmp(mode, "over") == 0)	p.Mode = SSysInfoParam::Over;
 				else if (stricmp(mode, "overonly") == 0) p.Mode = SSysInfoParam::OverOnly;
 				else if (stricmp(mode, "center") == 0)	p.Mode = SSysInfoParam::Center;
+				else if (stricmp(mode, "centeraround") == 0)	p.Mode = SSysInfoParam::CenterAround;
 				else if (stricmp(mode, "around") == 0)	p.Mode = SSysInfoParam::Around;
 
 				ClientCfg.SystemInfoParams[toLower(sic->asString(2 * k))] = p;
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index 86e70c1b8..3925aaf2d 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -635,12 +635,15 @@ struct CClientConfig
 	// Mode is the display settings :
 	// Normal	: just display in the system info window
 	// Over		: must be displayed at bottom of the screen and in system info window
+	// OverOnly		: must be displayed at bottom of the screen
 	// Center	; must be displayed at the center of the screen and in system info window
+	// Around	; must be displayed in the around chat window
+	// CenterAround	; must be displayed at the center of the screen and in around chat window
 	struct SSysInfoParam
 	{
 		CRGBA Color;
 		std::string SysInfoFxName;
-		enum TMode { Normal, Over, OverOnly, Center, Around };
+		enum TMode { Normal, Over, OverOnly, Center, Around, CenterAround };
 		TMode Mode;
 		SSysInfoParam()
 		{
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
index 22d65d138..5f3314cb2 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2571,7 +2571,9 @@ class CAHAddShape : public IActionHandler
 						skel.setPos(CVector((float)x, (float)y, (float)z));
 						skel.setRotQuat(dir.getRot());
 					}
-				} else {
+				}
+				else
+				{
 					instance.setScale(instance.getScale()*s);
 					instance.setPos(CVector((float)x, (float)y, (float)z));
 					instance.setRotQuat(dir.getRot());
@@ -3168,7 +3170,6 @@ class CHandlerGameConfigFullscreen : public IActionHandler
 			// hide frequencies combo
 			pCB= dynamic_cast<CDBGroupComboBox*>(pIM->getElementFromId( GAME_CONFIG_VIDEO_FREQS_COMBO ));
 			if (pCB) pCB->setActive(false);
-
 		}
 
 		// **** dirt the apply button of the DDX
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
index ddcb324d7..3774764b4 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -244,6 +244,7 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 			i++;
 	}
 
+	bool showSlotAndCreator = false;
 	// If an active window get the same object, abort, but make it top.
 	for(i=0;i<_ActiveWindows.size();i++)
 	{
@@ -261,6 +262,8 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 				// for items, must also test if they have the same itemSlotId, cause relies also on "ItemInfo system"
 				if(elt->getType() == CCtrlSheetInfo::SheetType_Item)
 				{
+					showSlotAndCreator = true;
+
 					CDBCtrlSheet		*realCtrlDst= _InfoWindows[_ActiveWindows[i]].CtrlSheet;
 					if(!realCtrlDst)
 						ok= false;
@@ -344,6 +347,13 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 	CInterfaceGroup	*group= _InfoWindows[newIndexWindow].Window;
 	nlassert(group);
 
+	CInterfaceElement *ctrl = group->getElement(group->getId()+":content:ctrl_slot");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+	ctrl = group->getElement(group->getId()+":content:creator");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+	ctrl = group->getElement(group->getId()+":content:creator_header");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+
 	// activate it, set top, copy item watched
 	group->setActive(true);
 	pIM->setTopWindow(group);
@@ -1217,6 +1227,7 @@ static void setupSkillToTradeHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	ucstring	skillText;
@@ -2278,6 +2289,7 @@ static void setupItemHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// NB: for raw materials only, must do each once only, must not do it at refresh, cause combo reseted
@@ -2566,6 +2578,7 @@ static void setupPactHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 
@@ -2603,6 +2616,7 @@ static void setupMissionHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// get detail text id from db
@@ -2840,6 +2854,7 @@ void setupOutpostBuildingHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	const COutpostBuildingSheet *pOBS = setup.SrcSheet->asOutpostBuildingSheet();
@@ -3164,6 +3179,7 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// **** setup the phrase Text info
@@ -3233,6 +3249,7 @@ static void setupSabrinaBrickHelp(CSheetHelpSetup &setup, bool auraDisabled)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index 1cd5644d4..bde03fa4b 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -997,7 +997,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	CCtrlTextButton *confirmButton =  dynamic_cast<CCtrlTextButton*>(ig->getCtrl("ok"));
 	if (confirmButton)
 	{
-		confirmButton->setActive( sheet->getLockedByOwner() );
+		confirmButton->setActive( !sheet->getLockedByOwner() );
 		confirmButton->setText(CI18N::get("uiSellImmediately"));
 		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
 	}
diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp
index 388064131..e17426a79 100644
--- a/code/ryzom/client/src/interface_v3/group_html.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html.cpp
@@ -238,7 +238,7 @@ bool CGroupHTML::addBnpDownload(const string &url, const string &action, const s
 		}
 		else
 		{
-			return true;	
+			return true;
 		}
 	}
 	if (action != "delete")
@@ -361,7 +361,6 @@ void CGroupHTML::checkDownloads()
 								CFile::moveFile(file.c_str(), (file+".tmp").c_str());
 								if (lookupLocalFile (finalUrl, file.c_str(), false))
 								{
-									
 									CInterfaceManager *pIM = CInterfaceManager::getInstance();
 									pIM->executeLuaScript(it->luaScript, true);
 								}
@@ -469,10 +468,10 @@ void CGroupHTML::beginBuild ()
 
 TStyle CGroupHTML::parseStyle (const string &str_styles)
 {
-	TStyle	styles;	
+	TStyle	styles;
 	vector<string> elements;
 	NLMISC::splitString(str_styles, ";", elements);
-	
+
 	for(uint i = 0; i < elements.size(); ++i)
 	{
 		vector<string> style;
@@ -485,7 +484,7 @@ TStyle CGroupHTML::parseStyle (const string &str_styles)
 			styles[trim(style[0])] = fullstyle;
 		}
 	}
-		
+
 	return styles;
 }
 
@@ -584,7 +583,7 @@ void CGroupHTML::addLink (uint element_number, uint /* attribute_number */, HTCh
 				else if (_TrustedDomain && suri[0] == '#')
 				{
 					// Direct url (hack for lua beginElement)
-					_Link.push_back (suri.substr(1));	
+					_Link.push_back (suri.substr(1));
 				}
 				else
 				{
@@ -615,7 +614,7 @@ void CGroupHTML::addLink (uint element_number, uint /* attribute_number */, HTCh
 					_LinkTitle.push_back(title);
 				}
 				else
-					_LinkTitle.push_back("");					
+					_LinkTitle.push_back("");
 			}
 			else
 			{
@@ -964,8 +963,8 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 					}
 				}
 
-				if (!templateName.empty()) 
-				{ 
+				if (!templateName.empty())
+				{
 					string parentId;
 					bool haveParentDiv = getDiv() != NULL;
 					if (haveParentDiv)
@@ -1175,7 +1174,7 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 						// Get the option to reload (class==reload)
 						bool reloadImg = false;
 
-						string style;						
+						string style;
 						if (present[MY_HTML_IMG_STYLE] && value[MY_HTML_IMG_STYLE])
 							style = value[MY_HTML_IMG_STYLE];
 
@@ -1189,7 +1188,7 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 								reloadImg = true;
 						}
 						
-						addImage (value[MY_HTML_IMG_SRC], globalColor, reloadImg);						
+						addImage (value[MY_HTML_IMG_SRC], globalColor, reloadImg);
 					}
 				}
 			}
@@ -1835,7 +1834,7 @@ CGroupHTML::CGroupHTML(const TCtorParam &param)
 	_TimeoutValue(DEFAULT_RYZOM_CONNECTION_TIMEOUT)
 {
 	// add it to map of group html created
-	_GroupHtmlUID= ++_GroupHtmlUIDPool;		// valid assigned Id begin to 1!
+	_GroupHtmlUID= ++_GroupHtmlUIDPool; // valid assigned Id begin to 1!
 	_GroupHtmlByUID[_GroupHtmlUID]= this;
 
 	// init
@@ -3114,7 +3113,7 @@ struct CButtonFreezer : public CInterfaceElementVisitor
 
 static int timer_called = 0;
 
-static int 
+static int
 timer_callback(HTTimer *   const timer     ,
                void *      const user_data ,
                HTEventType const event     )
@@ -3125,7 +3124,7 @@ timer_callback(HTTimer *   const timer     ,
     nlassert(event == HTEvent_TIMEOUT);
     timer_called = 1;
     HTEventList_stopLoop();
-    
+
     /* XXX - The meaning of this return value is undocumented, but close
     ** inspection of libwww's source suggests that we want to return HT_OK. */
     return HT_OK;
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp
index 8d0066816..209e85ab2 100644
--- a/code/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -370,8 +370,14 @@ void CGuildManager::update()
 				{
 					for (uint j = 0; j < CachedGuildMembers.size(); ++j)
 					{
-						if ((CachedGuildMembers[j].Name == _GuildMembers[i].Name) &&
-							(CachedGuildMembers[j].Online != _GuildMembers[i].Online))
+						// Status change is from offline to online/abroad online or vice versa. 
+						TCharConnectionState prevState = CachedGuildMembers[j].Online;
+						TCharConnectionState curState = _GuildMembers[i].Online;
+						bool showMsg = (prevState != curState) && 
+									   (CachedGuildMembers[j].Name == _GuildMembers[i].Name) &&
+									   (prevState == ccs_offline || curState == ccs_offline);
+
+						if (showMsg)
 						{
 							ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
 							strFindReplace(msg, "%s", _GuildMembers[i].Name);
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 8e0851cf6..cfae646d2 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -4404,12 +4404,14 @@ void CInterfaceManager::displaySystemInfo(const ucstring &str, const string &cat
 		}
 	}
 
+	if (mode == CClientConfig::SSysInfoParam::Center || mode == CClientConfig::SSysInfoParam::CenterAround)
+		InSceneBubbleManager.addMessagePopupCenter(str, color);
+
 	// If over popup a string at the bottom of the screen
 	if ((mode == CClientConfig::SSysInfoParam::Over) || (mode == CClientConfig::SSysInfoParam::OverOnly))
 		InSceneBubbleManager.addMessagePopup(str, color);
-	else if (mode == CClientConfig::SSysInfoParam::Center)
-		InSceneBubbleManager.addMessagePopupCenter(str, color);
-	else if (mode == CClientConfig::SSysInfoParam::Around && PeopleInterraction.AroundMe.Window)
+	else if ( (mode == CClientConfig::SSysInfoParam::Around || mode == CClientConfig::SSysInfoParam::CenterAround) 
+		&& PeopleInterraction.AroundMe.Window)
 		PeopleInterraction.ChatInput.AroundMe.displayMessage(str, color, 2);
 }
 
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/code/ryzom/client/src/interface_v3/people_interraction.cpp
index a92d73ce3..ba67661bf 100644
--- a/code/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/code/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -1420,11 +1420,9 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 		sint index = FriendList.getIndexFromContactId(contactId);
 		if (index != -1)
 		{
+			// Only do work if online status has changed
 			if (FriendList.getOnline(index) != online)
 			{
-				// Only do work if online status has changed
-				FriendList.setOnline(index, online);
-
 				CCDBNodeLeaf* node = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB", false);
 				if (node && node->getValueBool())
 				{
@@ -1441,8 +1439,11 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 						}
 					}
 					
-					// Player is not in my guild
-					if (bOnlyFriend)
+					TCharConnectionState prevState = FriendList.getOnline(index);
+					bool showMsg = bOnlyFriend && (prevState == ccs_offline || online == ccs_offline);
+
+					// Player is not in my guild, and the status change is from offline to online/abroad online or vice versa. 
+					if (showMsg)
 					{
 						ucstring msg = (online != ccs_offline) ? CI18N::get("uiPlayerOnline") : CI18N::get("uiPlayerOffline");
 						strFindReplace(msg, "%s", FriendList.getName(index));
@@ -1458,6 +1459,8 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 						PeopleInterraction.ChatInput.AroundMe.displayMessage(msg, col, 2, &dummy);
 					}
 				}
+
+				FriendList.setOnline(index, online);
 			}
 		}
 	}
@@ -2088,7 +2091,7 @@ public:
 					if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 					{
 						uint8 teamMember = (uint8) peopleIndex;
-						out.serialEnum(teamMember);
+						out.serial(teamMember);
 						NetMngr.push(out);
 						//nlinfo("impulseCallBack : %s %d sent", msgName.c_str(), teamMember);
 					}
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index e43d6c8f5..157a97f8a 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -1794,6 +1794,7 @@ class CAHOpenURL : public IActionHandler
 		}
 		else
 		{
+			DWORD ret = 0;
 			LPVOID lpMsgBuf;
 			FormatMessage(
 				FORMAT_MESSAGE_ALLOCATE_BUFFER |
diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp
index 0de8bc626..d7a17c20f 100644
--- a/code/ryzom/client/src/r2/editor.cpp
+++ b/code/ryzom/client/src/r2/editor.cpp
@@ -4392,7 +4392,7 @@ bool CEditor::doLuaScript(const char *filename, const char *fileDescText)
 		return false;
 	}
 
-	if( 0 && FINAL_VERSION == 1) // deactivated for the moment because there are lua file that must be loaded from example
+	if( 0 && FINAL_VERSION == 1) // disabled for the moment because there are lua file that must be loaded from example
 	{
 		const static std::string path = "data_common.bnp@";
 		const static std::string::size_type len= path.size();
diff --git a/code/ryzom/client/src/string_manager_client.cpp b/code/ryzom/client/src/string_manager_client.cpp
index dd79da45e..5dfead832 100644
--- a/code/ryzom/client/src/string_manager_client.cpp
+++ b/code/ryzom/client/src/string_manager_client.cpp
@@ -1605,29 +1605,38 @@ const ucchar *CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CShee
 // ***************************************************************************
 const ucchar *CStringManagerClient::getTitleLocalizedName(const std::string &titleId, bool women)
 {
-	const ucchar * infos = getSpecialWord(titleId, women);
-	ucstring infosUC(infos);
+	vector<ucstring> listInfos = getTitleInfos(titleId, women);
 
-	vector<ucstring> listInfos;
-	splitUCString(infosUC, ucstring("#"), listInfos);
-	if (listInfos.empty())
-		return infos;
-
-	_TitleWords.push_back(listInfos[0]);
-	return _TitleWords.back().c_str();
+	if (listInfos.size() > 0)
+	{
+		_TitleWords.push_back(listInfos[0]);
+		return _TitleWords.back().c_str();
+	}
+	
+	ucstring ucId;
+	ucId.fromUtf8(titleId);
+	return ucId.c_str();
 }
 
+// ***************************************************************************
 vector<ucstring> CStringManagerClient::getTitleInfos(const std::string &titleId, bool women)
 {
-	const ucchar * infos = getSpecialWord(titleId, women);
-	ucstring infosUC(infos);
-
+	ucstring infosUC;
+	infosUC.fromUtf8(titleId);
 	vector<ucstring> listInfos;
 	splitUCString(infosUC, ucstring("#"), listInfos);
+
+	if (listInfos.size() > 0)
+	{
+		if (titleId[0] != '#')
+		{
+			listInfos[0] = getSpecialWord(listInfos[0].toUtf8(), women);
+		}
+	}
+
 	return listInfos;
 }
 
-
 // ***************************************************************************
 const ucchar *CStringManagerClient::getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type)
 {
diff --git a/code/ryzom/client/src/string_manager_client.h b/code/ryzom/client/src/string_manager_client.h
index 13f8188bb..0f34e24ac 100644
--- a/code/ryzom/client/src/string_manager_client.h
+++ b/code/ryzom/client/src/string_manager_client.h
@@ -108,6 +108,7 @@ public:
 	// Get the Localized Title name
 	static const ucchar *getTitleLocalizedName(const std::string &titleId, bool women);
 	static std::vector<ucstring> getTitleInfos(const std::string &titleId, bool women);
+
 	// Get the Localized name of a classification type
 	static const ucchar *getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type);
 
diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt
index 6342f468d..61292431c 100644
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@@ -1,13 +1,32 @@
 FILE(GLOB SRC *.cpp time_weather_season/*.cpp)
 FILE(GLOB PRIV_H *.h time_weather_season/*.h)
 
-SOURCE_GROUP(headers FILES ${PRIV_H})
+FILE(GLOB R2 
+	dms.h dms.cpp
+	scenario.h scenario.cpp
+	user_connection_mgr.h user_connection_mgr.cpp
+	object.h object.cpp
+	server_animation_module.h server_animation_module.cpp
+	server_admin_module.h server_admin_module.cpp
+	server_edition_module.h server_edition_module.cpp
+	string_mgr_module.h string_mgr_module.cpp
+	scenario_entry_points.h scenario_entry_points.cpp
+	small_string_manager.h small_string_manager.cpp
+	ai_wrapper.h ai_wrapper.cpp
+	r2_*.h r2_*.cpp
+	ring_*.h ring_*.cpp)
+
+LIST(REMOVE_ITEM SRC R2)
+LIST(REMOVE_ITEM PRIV_H R2)
+
+SOURCE_GROUP("" FILES ${SRC} ${PRIV_H})
+SOURCE_GROUP("R2" FILES ${R2})
 
 # Filter out the source files not actually compiled.
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
 LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
 
-NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC})
+NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC} ${R2})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/code/ryzom/common/src/game_share/character_sync_itf.h b/code/ryzom/common/src/game_share/character_sync_itf.h
index 459659732..5481045ed 100644
--- a/code/ryzom/common/src/game_share/character_sync_itf.h
+++ b/code/ryzom/common/src/game_share/character_sync_itf.h
@@ -1108,9 +1108,7 @@ namespace CHARSYNC
 
 		void setResult(TCharacterNameResult value)
 		{
-
 				_Result = value;
-
 		}
 			//
 		uint32 getUserId() const
@@ -1120,9 +1118,7 @@ namespace CHARSYNC
 
 		void setUserId(uint32 value)
 		{
-
 				_UserId = value;
-
 		}
 			//
 		uint8 getCharIndex() const
@@ -1132,9 +1128,7 @@ namespace CHARSYNC
 
 		void setCharIndex(uint8 value)
 		{
-
 				_CharIndex = value;
-
 		}
 			//
 		const ucstring& getFullName() const
@@ -1144,9 +1138,7 @@ namespace CHARSYNC
 
 		void setFullName(const ucstring &value)
 		{
-
 				_FullName = value;
-
 		}
 
 		bool operator == (const CValidateNameResult &other) const
@@ -1161,7 +1153,6 @@ namespace CHARSYNC
 		// constructor
 		CValidateNameResult()
 		{
-
 		}
 
 		void serial(NLMISC::IStream &s)
@@ -1170,7 +1161,6 @@ namespace CHARSYNC
 			s.serial(_UserId);
 			s.serial(_CharIndex);
 			s.serial(_FullName);
-
 		}
 
 
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.cpp b/code/ryzom/common/src/game_share/deployment_configuration.cpp
index b5f0b94e9..86059fc7e 100644
--- a/code/ryzom/common/src/game_share/deployment_configuration.cpp
+++ b/code/ryzom/common/src/game_share/deployment_configuration.cpp
@@ -1,6 +1,18 @@
-/** \file deployment_configuration.cpp
- *
- */
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //-----------------------------------------------------------------------------
 // include
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.h b/code/ryzom/common/src/game_share/deployment_configuration.h
index f79a36410..457d6ee0b 100644
--- a/code/ryzom/common/src/game_share/deployment_configuration.h
+++ b/code/ryzom/common/src/game_share/deployment_configuration.h
@@ -1,8 +1,18 @@
-/** \file deployment_configuration.h
- *
- *
- */
-
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DEPLOYMENT_CONFIGURATION_H
 #define DEPLOYMENT_CONFIGURATION_H
 
diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
index d7bfc39e7..e08716a4d 100644
--- a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
+++ b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
@@ -884,6 +884,7 @@ namespace RYMSG
 		std::vector< NLMISC::CSheetId >	_LootList;
 		//
 		NLMISC::CSheetId	_Outpost;
+		uint32				_Organization;
 		//
 		float	_MaxHitRangeForPC;
 		//
@@ -1336,6 +1337,21 @@ namespace RYMSG
 				_Outpost = value;
 
 
+		}
+
+		//
+		uint32 getOrganization() const 
+		{
+			return _Organization;
+		}
+
+		void setOrganization(uint32 value)
+		{
+			
+			
+				_Organization = value;
+			
+	
 		}
 			//
 		float getMaxHitRangeForPC() const
@@ -1431,6 +1447,7 @@ namespace RYMSG
 				&& _ContextOptions == other._ContextOptions
 				&& _LootList == other._LootList
 				&& _Outpost == other._Outpost
+				&& _Organization == other._Organization
 				&& _MaxHitRangeForPC == other._MaxHitRangeForPC
 				&& _UserModelId == other._UserModelId
 				&& _CustomLootTableId == other._CustomLootTableId
@@ -1489,6 +1506,7 @@ namespace RYMSG
 			s.serialCont(_ContextOptions);
 			s.serialCont(_LootList);
 			s.serial(_Outpost);
+			s.serial(_Organization);
 			s.serial(_MaxHitRangeForPC);
 			s.serial(_UserModelId);
 			s.serial(_CustomLootTableId);
diff --git a/code/ryzom/common/src/game_share/persistent_data_template.h b/code/ryzom/common/src/game_share/persistent_data_template.h
index 08211687a..21cb2588d 100644
--- a/code/ryzom/common/src/game_share/persistent_data_template.h
+++ b/code/ryzom/common/src/game_share/persistent_data_template.h
@@ -175,6 +175,42 @@
 #include "nel/misc/hierarchical_timer.h"
 inline uint32 saveGameCycleToSecond(NLMISC::TGameCycle tick)
 {
+    // Evaluate the UTC of this event (with the current date of save). Suppose that 1 second==10 tick
+    // NB: result should be positive since no event should have been launched before 1970!
+    if (tick < CTickEventHandler::getGameCycle())
+    {
+        NLMISC::TGameCycle tick_dt = CTickEventHandler::getGameCycle() - tick;
+        uint32 s_dt = tick_dt / 10;
+        return NLMISC::CTime::getSecondsSince1970() - s_dt;
+    }
+    else
+    {
+        NLMISC::TGameCycle tick_dt = tick - CTickEventHandler::getGameCycle();
+        uint32 s_dt = tick_dt / 10;
+        return NLMISC::CTime::getSecondsSince1970() + s_dt;
+    }
+}
+inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second)
+{
+    if (second < NLMISC::CTime::getSecondsSince1970())
+    {
+        uint32 s_dt = NLMISC::CTime::getSecondsSince1970() - second;
+        NLMISC::TGameCycle tick_dt = s_dt * 10;
+        return CTickEventHandler::getGameCycle() - tick_dt;
+    }
+    else
+    {
+        uint32 s_dt = second - NLMISC::CTime::getSecondsSince1970();
+        NLMISC::TGameCycle tick_dt = s_dt * 10;
+        return CTickEventHandler::getGameCycle() + tick_dt;
+    }
+}
+
+/*inline uint32 saveGameCycleToSecond(NLMISC::TGameCycle tick)
+{
+	sint32 dt = CTickEventHandler::getGameCycle() - tick;
+
+
 	// Evaluate the UTC of this event (with the current date of save). Suppose that 1 second==10 tick
 	if (tick < CTickEventHandler::getGameCycle())
 		return NLMISC::CTime::getSecondsSince1970();
@@ -190,7 +226,7 @@ inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second)
 	
 	// Convert UTC of the event to game cycle. Suppose that 1 second==10 tick
 	return CTickEventHandler::getGameCycle() + (second - NLMISC::CTime::getSecondsSince1970())*10;
-}
+}*/
 #endif
 
 // GameCycle property (saved as a UTC of the current game cycle, support server migration)
diff --git a/code/ryzom/common/src/game_share/sp_type.cpp b/code/ryzom/common/src/game_share/sp_type.cpp
index 1ab59ed04..a05a8b554 100644
--- a/code/ryzom/common/src/game_share/sp_type.cpp
+++ b/code/ryzom/common/src/game_share/sp_type.cpp
@@ -51,4 +51,4 @@ std::map<std::string, CSPType::TSPType>	CSPType::_ValueMap;
 // End of static implementation of CSPType
 
 
-} // End of EGSPD
\ No newline at end of file
+} // End of EGSPD
diff --git a/code/ryzom/common/src/game_share/txt_command.h b/code/ryzom/common/src/game_share/txt_command.h
new file mode 100644
index 000000000..f8d2ec39e
--- /dev/null
+++ b/code/ryzom/common/src/game_share/txt_command.h
@@ -0,0 +1,174 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#ifndef TXT_COMMAND_H
+#define TXT_COMMAND_H
+
+
+//-------------------------------------------------------------------------------------------------
+// includes
+//-------------------------------------------------------------------------------------------------
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+#include "nel/misc/debug.h"
+#include "nel/misc/sstring.h"
+
+
+//-------------------------------------------------------------------------------------------------
+// MACRO TXT_COMMAND_SET
+//-------------------------------------------------------------------------------------------------
+
+#define TXT_COMMAND_SET(setName,CONTEXT_CLASS)\
+class __CTxtCommandSet_##setName: public ITxtCommandSet<CONTEXT_CLASS>\
+{\
+public:\
+	static __CTxtCommandSet_##setName* getInstance()\
+	{\
+		static __CTxtCommandSet_##setName *p=NULL;\
+		if (p==NULL) p= new __CTxtCommandSet_##setName;\
+		return p;\
+	}\
+};\
+static CTxtCommandSetPtr<__CTxtCommandSet_##setName> setName;
+
+
+//-------------------------------------------------------------------------------------------------
+// MACRO TXT_COMMAND
+//-------------------------------------------------------------------------------------------------
+
+#define TXT_COMMAND(cmdName,setName,CONTEXT_CLASS)\
+struct __CTxtCommand_##cmdName: public ITxtCommand<CONTEXT_CLASS>\
+{\
+	static __CTxtCommand_##cmdName* getInstance()\
+	{\
+		static __CTxtCommand_##cmdName *p=NULL;\
+		if (p==NULL) p= new __CTxtCommand_##cmdName;\
+		return p;\
+	}\
+	virtual const char* getName() const {return #cmdName;}\
+	virtual CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine);\
+private:\
+	__CTxtCommand_##cmdName() {}\
+};\
+static ITxtCommandRegisterer<__CTxtCommand_##cmdName,__CTxtCommandSet_##setName> __CTxtCommand_##cmdName##_Registerer;\
+CTxtCommandResult __CTxtCommand_##cmdName::execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine)
+
+
+//-------------------------------------------------------------------------------------------------
+// class CTxtCommandResult
+//-------------------------------------------------------------------------------------------------
+
+class CTxtCommandResult
+{
+public:
+	enum TType
+	{ 
+		SUCCESS,			// command execution was successful
+		SYNTAX_ERROR,		// there was a syntax error in the command line
+		BAD_PERMISSION,		// the user doesn't have the right to run the given command
+		UNKNOWN_COMMAND,	// behave as if the command was not recognised
+		EXECUTION_ERROR		// there was an error during execution of the command
+	};
+	CTxtCommandResult(const bool& success): _Type(success?SUCCESS:SYNTAX_ERROR) {}
+	CTxtCommandResult(const TType& type): _Type(type) {}
+	CTxtCommandResult(const TType& type,const NLMISC::CSString& reason): _Type(type), _Reason(reason) {}
+	TType getType() const { return _Type; }
+	const NLMISC::CSString& getReason() const { return _Reason; }
+private:
+	TType _Type;
+	NLMISC::CSString _Reason;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommand
+//-------------------------------------------------------------------------------------------------
+
+template <class CONTEXT_CLASS> class ITxtCommand
+{
+public:
+	virtual const char* getName() const =0;
+	virtual CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine) =0;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandRegisterer
+//-------------------------------------------------------------------------------------------------
+
+template <class CMD,class SET> struct ITxtCommandRegisterer
+{
+	ITxtCommandRegisterer()
+	{
+		SET::getInstance()->registerTxtCommand(CMD::getInstance());
+	}
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandSet
+//-------------------------------------------------------------------------------------------------
+
+template <class CONTEXT_CLASS> class ITxtCommandSet
+{
+public:
+	void registerTxtCommand(ITxtCommand<CONTEXT_CLASS>* txtCommand)
+	{
+		nlassert(_TxtCommands.find(txtCommand->getName())==_TxtCommands.end());
+		_TxtCommands[txtCommand->getName()]= txtCommand;
+	}
+	CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CSString& cmdLine)
+	{
+		NLMISC::CSString cmdTail=cmdLine;
+		NLMISC::CSString keyword=cmdTail.firstWord(true);
+		typename TTxtCommands::iterator it= _TxtCommands.find(keyword);
+		if (it==_TxtCommands.end()) return CTxtCommandResult::UNKNOWN_COMMAND;
+		NLMISC::CVectorSString args;
+		cmdTail.splitWords(args);
+		return it->second->execute(context,args,cmdTail,cmdLine);
+	}
+private:
+	typedef ITxtCommand<CONTEXT_CLASS> TTxtCommand;
+	typedef std::map<NLMISC::CSString,TTxtCommand*> TTxtCommands;
+	TTxtCommands _TxtCommands;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandRegisterer
+//-------------------------------------------------------------------------------------------------
+
+template <class SET> struct CTxtCommandSetPtr
+{
+	CTxtCommandSetPtr()
+	{
+		SET::getInstance();
+	}
+
+	SET& operator*()
+	{
+		return *SET::getInstance();
+	}
+
+	SET* operator->()
+	{
+		return SET::getInstance();
+	}
+};
+
+
+//-------------------------------------------------------------------------------------------------
+#endif
diff --git a/code/ryzom/server/data_shard/client_commands_privileges.txt b/code/ryzom/server/data_shard/client_commands_privileges.txt
index c61537dfa..9b0e115d4 100644
--- a/code/ryzom/server/data_shard/client_commands_privileges.txt
+++ b/code/ryzom/server/data_shard/client_commands_privileges.txt
@@ -40,6 +40,9 @@ forceTargetToDie			:DEV:SGM:GM:EM:		// Force entity target to die
 getEventFaction				:DEV:SGM:GM:EM:		// Get the event faction of player: <player name>
 giveRespawnPoint			:DEV:SGM:GM:		// Give a respawn point to a player: <respawn point name>
 guildInvite							// Send a guild invite to a player character without distance constrainte
+setLeague							// Create a League 
+leagueInvite							// Send a League invite to a Team Leader character without distance constrainte
+leagueKick							// Kick a player or team from league
 roomInvite							// Send a room invite
 roomKick							// Remove a room invite
 guildMOTD							// Set the guild message of the day, command effective only for officer and more graded guild members
@@ -72,8 +75,6 @@ renameGuild					:DEV:SGM:GM:EM:		// Rename a guild: <guild name> <new guild name
 renamePlayer		[SU]	:DEV:SGM:GM:EM:		// Rename a player: <player name> <new playerName>
 renamePlayerForEvent		:DEV:SGM:GM:EM:EG:		// Rename a player temporarily for an event: <player name> <new playerName>
 resetPowerFlags				:DEV:SGM:GM:EM:		// Reset the ineffective aura and the power flags for given character
-respawnAfterDeath						// Respawn after death at re-spawn point name, it must be valid (validated by PC and usable): <Respawn idx>
-resurrected							// Another PC resurrect PC by giving some energy: <Hp> <Sta> <Sap> <Focus>
 root						:DEV:SGM:GM:EM:VG:SG:		// Root a player: <player name> <time in seconds>
 saveToPDR					:DEV:SGM:		// Save a character to a binary PDR file: <file name>
 saveToXML					:DEV:SGM:		// Save a character to an XML file: <file name>
@@ -87,6 +88,8 @@ setGuildMessage							// Set the guild message of the day: <message>
 setItemSapLoad				:DEV:SGM:GM:EM:		// Set an item sap load: <slot index in bag (starts at 0)> <float value>
 setPosFlag					:DEV:SGM:GM:EM		// Set a position flag: <flag name>
 setPvPTag									// Set player character PvP tag to true or false
+setFamePlayer				:DEV:SGM:GM:EM:		// Set the fame value of a player in the given faction: <faction> <fame>
+resetPVPTimers				:DEV:SGM:GM:EM:		// Reset the pvp timers of a player: <player name>
 setSkillsToMaxValue			:DEV:SGM:GM:EM:		// Set player skills to max value
 showCSR						:DEV:SGM:GM:VG:SG:G:EM:EG:	// Show CSR title if the player is a CSR
 showFBT						:DEV:SGM:GM:EM:		// Show Focus Beta Tester title if the player is a FBT
@@ -100,6 +103,7 @@ connectUserChannel								// Connect to User Channel Chat
 webExecCommand									// Execute web command (need HMAC signature)
 webDelCommandsIds								// Delete web transactions for web_app
 webAddCommandsIds								// Add web command transactions for web_app
+updateTarget									// Update current target
 teleport					:DEV:SGM:GM:VG:SG:G:OBSERVER:EM:EG:	// Teleport the CSR in front of a player: <player name>
 tpPosFlag					:DEV:SGM:GM:VG:SG:G:EM:EG:	// Teleport a player to a position flag: <flag name>
 universe					:DEV:SGM:GM:EM:		// Chat in universe mode: <boolean>
@@ -107,7 +111,6 @@ unmute						:DEV:SGM:GM:EM:VG:SG:		// Unmute a user: <player name>
 unmuteUniverse				:DEV:SGM:GM:EM:VG:SG:		// Unmute the universe channel
 unroot						:DEV:SGM:GM:EM:VG:SG:		// Stop rooting a player: <player name>
 updateGuildMembersList		:DEV:SGM:GM:		// update guild members list on members clients: <guild name>
-validateRespawnPoint						// Validate re-spawn point: <Re-spawn point idx>
 //setPvpClan				:DEV:			// choose a clan for pvp
 summonPet							// player can summon it's pet one time only
 allowSummonPet				:DEV:SGM:GM:		// autorize player to summon it's pet one time per pet
@@ -121,6 +124,14 @@ farTPReturn					:DEV:SGM:GM:VG:SG:EM:	// used to tp back to your previous sessio
 characterMissionDump			:DEV:SGM:GM:		//Dump mission list for a character
 removeMission				:DEV:SGM:GM:		//Remove a mission of a character
 addMission				:DEV:SGM:GM:		//add a mission to a character
+characterInventoryDump		:DEV:SGM:GM:EM:		// Dump character inventory info: <inventory> <from slot> <to slot>
+deleteInventoryItem			:DEV:SGM:GM:EM:		// Delete an item from a characters inventory: <inventory> <slot> <sheetname> <quality> <quantity>
+lockItem										// Lock/unlock item for trading, selling, destruction.
+setTeamLeader									// Set the team leader
+setPetAnimalSatiety			:DEV:SGM:GM:EM:		// Set the satiety of pet animal (petIndex in 0..3): <petIndex> full|<value> [<nameForAnswer>]
+getPetAnimalSatiety			:DEV:SGM:GM:EM:		// Get the satiety of pet animal (petIndex in 0..3): <petIndex> [<nameForAnswer>]
+setPetAnimalName			:DEV:SGM:GM:EM:EG:	// Set the name of a pet animal (petIndex in 0..3): <petIndex> <name>
+setSimplePhrase				:DEV:SGM:GM:EM:		// Set an IOS phrase: <id> <phrase> [<language code>]
 
 // Variables
 //
@@ -138,6 +149,7 @@ Name					:DEV:SGM:GM:EM:		// Name of a player
 Position				:DEV:SGM:GM:VG:PR:OBSERVER:EM:EG:		// Position of a player (in meters) <posx>,<posy>[,<posz>]] | <bot name> | <player name> | home
 Priv					:DEV:			// User privilege
 PriviledgePVP			:DEV:SGM:GM:EM:EG:			// Turns PVP on/off on character (blame coder for typo)
+FullPVP			:DEV:SGM:GM:EM:EG:			// Turns Full PVP on/off on character (blame coder for typo)
 RyzomDate				:DEV:SGM:GM:EM:		// Current ryzom date
 RyzomTime				:DEV:SGM:GM:EM:		// Current ryzom time
 
@@ -160,3 +172,8 @@ eventSetBotFameByKill			:DEV:SGM:GM:EM:		// Changes the amount of fame earned fo
 eventSetBotURL					:DEV:SGM:GM:EM:     // Set the url of a bot
 eventSetBotURLName				:DEV:SGM:GM:EM:     // Set the url name of a bot
 eventSpawnToxic				:DEV:SGM:GM:EM:		// Add toxic cloud
+eventNpcSay					:DEV:SGM:GM:EM:		// Have an NPC say a text
+eventSetBotFacing			:DEV:SGM:GM:EM:		// Set the direction in which a bot faces
+eventGiveControl			:DEV:SGM:GM:EM:		// Give control of entity A to entity B : <master eid> <slave eid>
+eventLeaveControl			:DEV:SGM:GM:EM:		// Leave control of entity : <master eid>
+resetName										// Reset player's name; undo a temporary rename
diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt
index ddcca99bb..13cee545a 100644
--- a/code/ryzom/server/src/CMakeLists.txt
+++ b/code/ryzom/server/src/CMakeLists.txt
@@ -34,7 +34,7 @@ ADD_SUBDIRECTORY(patchman_service)
 #ADD_SUBDIRECTORY(ags_test)
 #ADD_SUBDIRECTORY(ai_data_service)
 #ADD_SUBDIRECTORY(entity_view_service)
-#ADD_SUBDIRECTORY(general_utilities_service)
+ADD_SUBDIRECTORY(general_utilities_service)
 
 # Not sure, no longer used maybe?
 #sabrina
diff --git a/code/ryzom/server/src/ai_service/ai.cpp b/code/ryzom/server/src/ai_service/ai.cpp
index b51f1279c..ed8926f5b 100644
--- a/code/ryzom/server/src/ai_service/ai.cpp
+++ b/code/ryzom/server/src/ai_service/ai.cpp
@@ -423,6 +423,15 @@ void	CAIS::update()
 			_CreatureChangeHPList.Entities.clear();
 			_CreatureChangeHPList.DeltaHp.clear();
 		}
+		if (!_CreatureChangeMaxHPList.Entities.empty())
+		{
+			nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.MaxHp.size());
+			nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.SetFull.size());
+			_CreatureChangeMaxHPList.send("EGS");
+			_CreatureChangeMaxHPList.Entities.clear();
+			_CreatureChangeMaxHPList.MaxHp.clear();
+			_CreatureChangeMaxHPList.SetFull.clear();
+		}
 	}
 
 	//
diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h
index f06271c17..aed47f262 100644
--- a/code/ryzom/server/src/ai_service/ai.h
+++ b/code/ryzom/server/src/ai_service/ai.h
@@ -221,6 +221,11 @@ public:
 	{
 		return _CreatureChangeHPList;
 	}
+
+	CChangeCreatureMaxHPMsg &getCreatureChangeMaxHP()
+	{
+		return _CreatureChangeMaxHPList;
+	}
 	
 	enum	TSearchType
 	{
@@ -288,6 +293,7 @@ private:
 	// Faunas descriptions to be sent each frame 
 	CFaunaBotDescription	_FaunaDescriptionList;
 	CChangeCreatureHPMsg	_CreatureChangeHPList;
+	CChangeCreatureMaxHPMsg	_CreatureChangeMaxHPList;
 
 	/// The emot identifiers
 	std::map<std::string, uint32>	_EmotNames;
diff --git a/code/ryzom/server/src/ai_service/ai_bot.cpp b/code/ryzom/server/src/ai_service/ai_bot.cpp
index 31ce2fce0..03e2a68db 100644
--- a/code/ryzom/server/src/ai_service/ai_bot.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot.cpp
@@ -61,7 +61,7 @@ CAIInstance* CSpawnBot::getAIInstance() const
 void CSpawnBot::setVisualPropertiesName()
 {
 	CBot& botRef = CSpawnBot::getPersistent();
-	std::string name = botRef.getName();
+	ucstring name = botRef.getName();
 	
 	if (CVisualPropertiesInterface::UseIdForName)
 	{
@@ -85,7 +85,7 @@ void CSpawnBot::setVisualPropertiesName()
 	if (! botRef.getFaunaBotUseBotName()) //false by default
 	{
 		if (botRef.getSheet()->ForceDisplayCreatureName())
-		return;
+			return;
 		// the npc name is displayed as a fauna
 	}
 
@@ -403,8 +403,8 @@ std::vector<std::string> CBot::getMultiLineInfoString() const
 	pushTitle(container, "CBot");
 	pushEntry(container, "id=" + getIndexString());
 	container.back() += " eid=" + getEntityIdString();
-	container.back() += " alias=" + getAliasTreeOwner()->getAliasString();
-	container.back() += " name=" + getName();
+	container.back() += " alias=" + getAliasTreeOwner()->getAliasString() + " raw alias=" + NLMISC::toString(getAliasTreeOwner()->getAlias());
+	pushEntry(container, " name=" + getName());
 	if (isSheetValid())
 		container.back() += " sheet=" + NLMISC::CFile::getFilenameWithoutExtension(getSheet()->SheetId().toString());
 	pushEntry(container, "fullname=" + getFullName());
diff --git a/code/ryzom/server/src/ai_service/ai_bot.h b/code/ryzom/server/src/ai_service/ai_bot.h
index d74442b83..3156edb82 100644
--- a/code/ryzom/server/src/ai_service/ai_bot.h
+++ b/code/ryzom/server/src/ai_service/ai_bot.h
@@ -95,7 +95,7 @@ public:
 	virtual float getAggroPropagationRadius() const;
 	//@}
 	
-	void setVisualPropertiesName();
+	virtual void setVisualPropertiesName();
 	
 	// as there not a lot of prop (1 or 2, maybe 3) stores in this comportment, we don't need hash.
 	bool getProp(size_t Id, uint32& value) const;
@@ -241,8 +241,8 @@ public:
 	
 	NLMISC::CEntityId createEntityId() const;
 	
-	const std::string& getCustomName() const { return _CustomName; }
-	void setCustomName(const std::string &name) { _CustomName = name; }
+	const ucstring& getCustomName() const { return _CustomName; }
+	void setCustomName(const ucstring &name) { _CustomName = name; }
 
 	virtual void setClientSheet(const std::string & clientSheetName);  
 
@@ -272,7 +272,7 @@ private:
 	bool _IgnoreOffensiveActions;
 	bool _Healer;
 	bool _BuildingBot;
-	std::string _CustomName;
+	ucstring _CustomName;
 	CTimer					_SetSheetTimer;
 	struct CSetSheetData
 	{
diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
index f56a745db..a8175cc9a 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
@@ -274,9 +274,12 @@ std::vector<std::string> CSpawnBotNpc::getMultiLineInfoString() const
 	else
 	{
 		vector<uint32> const& missions = _CurrentChatProfile.getMissions();
-		pushEntry(container, "missions: " + NLMISC::toString("%u", missions[0]));
-		for (size_t i=1; i<missions.size(); ++i)
-			container.back() += ", " + NLMISC::toString("%u", missions[i]);
+		pushEntry(container, "missions:");
+		for (size_t i=0; i<missions.size(); ++i)
+		{
+			string name = getAIInstance()->findMissionName(missions[i]);
+			pushEntry(container, NLMISC::toString("          %u (%s)", missions[i], name.c_str()));
+		}
 	}
 	pushFooter(container);
 	
diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
index e6177fda1..6e0747933 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "ai_bot_pet.h"
+#include "visual_properties_interface.h"
 
 #include "nel/misc/random.h"
 #include "ai_grp_pet.h"
@@ -92,3 +93,28 @@ CSpawnGroupPet& CSpawnBotPet::spawnGrp()
 {
 	return static_cast<CSpawnGroupPet&>(CSpawnBot::spawnGrp());
 }
+
+void CSpawnBotPet::setVisualPropertiesName()
+{
+	CBotPet& botRef = CSpawnBotPet::getPersistent();
+	ucstring name = botRef.getName();
+	
+	if (CVisualPropertiesInterface::UseIdForName)
+	{
+		name = NLMISC::toString("AI:%s", botRef.getIndexString().c_str());
+	}
+	
+	if (name.empty() && CVisualPropertiesInterface::ForceNames)
+	{
+		name = NLMISC::CFile::getFilenameWithoutExtension(botRef.getSheet()->SheetId().toString().c_str());
+	}
+	
+	if (!botRef.getCustomName().empty())
+		name = botRef.getCustomName();
+
+	//	no name the bot will appear without name on the client.
+	if (name.empty())
+		return;
+		
+	CVisualPropertiesInterface::setName(dataSetRow(), name);
+}
diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.h b/code/ryzom/server/src/ai_service/ai_bot_pet.h
index 34eacd039..67a448ee0 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_pet.h
+++ b/code/ryzom/server/src/ai_service/ai_bot_pet.h
@@ -65,6 +65,8 @@ public:
 	CPathPosition& pathPos() { return _PathPos; }
 	
 	uint32 _DeathTime;
+
+	void setVisualPropertiesName();
 	
 private:
 
diff --git a/code/ryzom/server/src/ai_service/ai_instance.cpp b/code/ryzom/server/src/ai_service/ai_instance.cpp
index 5fd8e878a..240af6da3 100644
--- a/code/ryzom/server/src/ai_service/ai_instance.cpp
+++ b/code/ryzom/server/src/ai_service/ai_instance.cpp
@@ -653,7 +653,7 @@ static float randomAngle()
 	return val;
 }
 
-CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName)
+CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look)
 {
 	if (!_EventNpcManager)
 		return NULL;
@@ -689,10 +689,13 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const&
 			CBotNpc* const bot = NLMISC::safe_cast<CBotNpc*>(grp->bots()[i]);
 
 			bot->setSheet(sheet);
+			if (!look.empty())
+				bot->setClientSheet(look);
 			bot->equipmentInit();
 			bot->initEnergy(/*groupEnergyCoef()*/0);
 			CAIVector rpos(pos);
-			if (i!=0)
+			// Spawn all randomly except if only 1 bot
+			if (nbBots > 1)
 			{
 				RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
 				RYAI_MAP_CRUNCH::CWorldPosition	wp;
@@ -857,6 +860,7 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa
 	double dispersionRadius;
 	bool spawnBots;
 	std::string botsName;
+	std::string look;
 	msgin.serial(messageVersion);
 	nlassert(messageVersion==1);
 	msgin.serial(instanceNumber);
@@ -869,10 +873,11 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa
 	msgin.serial(dispersionRadius);
 	msgin.serial(spawnBots);
 	msgin.serial(botsName);
+	msgin.serial(look);
 	CAIInstance* instance = CAIS::instance().getAIInstance(instanceNumber);
 	if (instance)
 	{
-		CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName);
+		CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName, look);
 		if (npcGroup != NULL)
 		{
 			_PlayersLastCreatedNpcGroup[playerId] = npcGroup->getName();
diff --git a/code/ryzom/server/src/ai_service/ai_instance.h b/code/ryzom/server/src/ai_service/ai_instance.h
index ce53d0559..6540620d9 100644
--- a/code/ryzom/server/src/ai_service/ai_instance.h
+++ b/code/ryzom/server/src/ai_service/ai_instance.h
@@ -207,7 +207,7 @@ public:
 			return NULL;
 	}
 
-	CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName);
+	CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look);
 
 	/// create a new easter egg
 	CBotEasterEgg* createEasterEgg(uint32 easterEggId, NLMISC::CSheetId const& sheetId, std::string const& botName, double x, double y, double z, double heading, const std::string& look);
diff --git a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
index e72a88abc..31e01d143 100644
--- a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
+++ b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
@@ -290,6 +290,11 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id)
 			}
 			
 			botPet->setSheet(sheet);
+
+			if (!CustomName.empty())
+			{
+				botPet->setCustomName(CustomName);
+			}
 			
 			if (!botPet->spawn())
 			{
@@ -314,7 +319,7 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id)
 #endif
 				return;
 			}
-			
+
 			botPet->getSpawn()->setAIProfile(new CAIPetProfileStand(botPet->getSpawn()));
 			
 			confirmMsg.PetMirrorRow = botPet->getSpawn()->dataSetRow();
diff --git a/code/ryzom/server/src/ai_service/ai_outpost.cpp b/code/ryzom/server/src/ai_service/ai_outpost.cpp
index 0ef71b2ee..ed2c62b77 100644
--- a/code/ryzom/server/src/ai_service/ai_outpost.cpp
+++ b/code/ryzom/server/src/ai_service/ai_outpost.cpp
@@ -873,14 +873,20 @@ void COutpost::createSquad(CGroupDesc<COutpostSquadFamily> const* groupDesc, COu
 	// Attack only the declared ennemies of the outpost
 	if (side==OUTPOSTENUMS::OutpostOwner)
 	{
-	//	grp->faction      ().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
-	//	grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
+		// Bots factions
+		grp->faction      ().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		// Players faction
 		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
 	}
 	if (side==OUTPOSTENUMS::OutpostAttacker)
 	{
-	//	grp->faction      ().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
-	//	grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
+		// Bots factions
+		grp->faction      ().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		// Players faction
 		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
 	}
 	grp->_AggroRange = 25;
diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
index a97beb24f..e47003cb6 100644
--- a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
@@ -1562,7 +1562,7 @@ void CGrpProfileGoToPoint::updateProfile(uint ticksSinceLastUpdate)
 			dx+=dir.x;
 			dy+=dir.y;
 			
-			// 4 rangées.
+			// 4 rows
 			CAIVector	idealPos=groupPosition;
 			if (botIndex>=_NbBotInNormalShape)
 			{
@@ -2054,7 +2054,7 @@ void CGrpProfileFollowRoute::updateProfile(uint ticksSinceLastUpdate)
 			dx+=dir.x;
 			dy+=dir.y;
 			
-			// 4 rangées.
+			// 4 rows
 			CAIVector	idealPos=groupPosition;
 			if (botIndex>=_NbBotInNormalShape)
 			{
@@ -2299,6 +2299,94 @@ void CGrpProfileStandOnVertices::updateProfile(uint ticksSinceLastUpdate)
 	}
 }
 	
+//////////////////////////////////////////////////////////////////////////////
+// CGrpProfileFollowPlayer                                                //
+//////////////////////////////////////////////////////////////////////////////
+CGrpProfileFollowPlayer::CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius)
+: CMoveProfile(owner)
+, _PlayerRow(playerRow)
+, _DispersionRadius(dispersionRadius)
+, _PathPos(CAngle(0))
+, _PathCont(NLMISC::safe_cast<CSpawnBotNpc*>(owner)->getAStarFlag())
+{
+	PROFILE_LOG("group", "follow player", "ctor", "");
+	_Status = CFollowPath::FOLLOWING;
+}
+
+bool CGrpProfileFollowPlayer::destinationReach()	const
+{
+	return	_Status == CFollowPath::FOLLOW_ARRIVED
+		||	_Status==CFollowPath::FOLLOW_NO_PATH;
+}
+
+void CGrpProfileFollowPlayer::beginProfile()
+{
+	_Status = CFollowPath::FOLLOWING;
+}
+
+// TODO: this doesn't work very well at all...
+void CGrpProfileFollowPlayer::updateProfile(uint ticksSinceLastUpdate)
+{
+	H_AUTO(CGrpProfileFollowPlayerUpdate);
+	CFollowPathContext fpcGrpFollowPlayerUpdate("CGrpProfileFollowPlayerUpdate");
+
+	// check all bot to see if there need to move 
+	CSpawnGroupNpc* grp = static_cast<CSpawnGroupNpc*>(static_cast<CSpawnGroup*>(_Grp));
+	CGroupNpc &pgrp = grp->getPersistent();
+	
+	CBotPlayer*	plrPtr	=	dynamic_cast<CBotPlayer*>(CAIS::instance().getEntityPhysical(_PlayerRow));
+
+	if ( ! plrPtr) {
+		nlwarning("CGrpProfileFollowPlayer: No valid player position to follow");
+		return;
+	}
+
+	_PathCont.setDestination(plrPtr->wpos());
+	_PathPos._Angle = plrPtr->theta();
+
+	for (uint i = 0; i < pgrp.bots().size(); ++i)
+	{
+		CBotNpc* bot = static_cast<CBotNpc*>(pgrp.bots()[i]);
+		if (!bot)
+			continue;
+
+		// check current bot state
+		CSpawnBotNpc *sbot = bot->getSpawn();
+		if (!sbot)
+			continue;
+
+		// Need to wait for a correct position before moving?
+		CAIVector const& dest = _PathCont.getDestination();
+		if (dest.x()==0 || dest.y()==0)
+			return;
+		
+		static const std::string runParameter("running");
+		float	dist;
+		if (sbot->getPersistent().getOwner()->getSpawnObj()->checkProfileParameter(runParameter))
+			dist = sbot->runSpeed()*ticksSinceLastUpdate;		
+		else
+			dist = sbot->walkSpeed()*ticksSinceLastUpdate;
+
+		// Move
+		CFollowPath::TFollowStatus const status = CFollowPath::getInstance()->followPath(
+			sbot,
+			_PathPos,
+			_PathCont,
+			dist,
+			0.f,
+			0.5f);
+
+		if (status==CFollowPath::FOLLOW_NO_PATH)
+		{
+			nlwarning("Problem with following player");
+		}
+
+		
+	}	
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 // CGrpProfileIdle                                                     //
 //////////////////////////////////////////////////////////////////////////////
@@ -3687,10 +3775,14 @@ bool CGrpProfileFaction::entityHavePartOfFactions(CAIEntityPhysical const* entit
 			std::set<TStringId>::const_iterator it, end = factionsSet.end();
 			for (it=factionsSet.begin(); it!=end; ++it)
 			{
-				std::string fameFaction = scriptFactionToFameFaction(CStringMapper::unmap(*it));
+				string factionInfos = CStringMapper::unmap(*it);
+				string fameFaction = scriptFactionToFameFaction(factionInfos);
 			//	sint32 fame = CFameInterface::getInstance().getFameOrCivilisationFame(entity->getEntityId(), CStringMapper::map(fameFaction));
 				sint32 const fame = entity->getFame(fameFaction);
-				if (fame!=NO_FAME && fame>0)
+				sint32 const value = scriptFactionToFameFactionValue(factionInfos);
+				bool gt = scriptFactionToFameFactionGreaterThan(factionInfos);
+				if ((fame != NO_FAME && gt && fame > value) ||
+					(fame != NO_FAME && !gt && fame < value))
 				{
 					//	nldebug("Entity has faction %s", CStringMapper::unmap(*it).c_str());
 					return true;
@@ -3731,12 +3823,41 @@ std::string CGrpProfileFaction::scriptFactionToFameFaction(std::string name)
 			ret += "_";
 			ret += name[i]-'A'+'a';
 		}
+		else if  (name[i] == '>' || name[i] == '<')
+		{
+			return ret;
+		}
 		else
+		{
 			ret += name[i];
+		}
 	}
 	return ret;
 }
 
+bool CGrpProfileFaction::scriptFactionToFameFactionGreaterThan(string name)
+{	
+	if (name.find("<") != string::npos)
+		return false;
+		
+	return true;
+}
+
+sint32 CGrpProfileFaction::scriptFactionToFameFactionValue(string name)
+{
+	size_t start = name.find(">");
+	if (start == string::npos)
+	{
+		start = name.find("<");
+		if (start == string::npos)
+			return 0;
+	}
+
+	sint32 value;
+	NLMISC::fromString(name.substr(start+1), value);
+	return value*6000;
+}
+
 std::string CGrpProfileFaction::fameFactionToScriptFaction(std::string name)
 {
 	std::string ret = "Famous";
@@ -3772,9 +3893,9 @@ void CGrpProfileFaction::checkTargetsAround()
 	CPropertySetWithExtraList<TAllianceId> const& thisEnnemyFactions = thisGrpNpc.ennemyFaction();
 
 	// We don't assist or attack players if our friends/ennemies are not in factions
-	bool const assistPlayers = thisFriendFactions.containsPartOfStrict(_FameFactions);
+	bool const assistPlayers = (thisFriendFactions.containsPartOfStrictFilter("Famous*") || thisFriendFactions.have(AITYPES::CPropertyId("Player")));
 	bool const assistBots    = !thisFriendFactions.empty() && !bNoAssist;
-	bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrict(_FameFactions) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*");
+	bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrictFilter("Famous*") || thisEnnemyFactions.have(AITYPES::CPropertyId("Player")) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*");
 	bool const attackBots    = !thisEnnemyFactions.empty();
 	
 	CAIVision<CPersistentOfPhysical>	Vision;
diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.h b/code/ryzom/server/src/ai_service/ai_profile_npc.h
index e46f1b4be..9fed6e662 100644
--- a/code/ryzom/server/src/ai_service/ai_profile_npc.h
+++ b/code/ryzom/server/src/ai_service/ai_profile_npc.h
@@ -628,6 +628,49 @@ private:
 	CAITimer _Timer;
 };
 
+class CGrpProfileFollowPlayer : 
+public CMoveProfile
+{
+public:
+	CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius);
+	virtual ~CGrpProfileFollowPlayer() {};
+
+	void setBotStandProfile(AITYPES::TProfiles	botStandProfileType, IAIProfileFactory* botStandProfileFactory);
+
+	/// @name IAIProfile implementation
+	//@{
+	virtual void beginProfile();
+	virtual void updateProfile(uint ticksSinceLastUpdate);
+	virtual void endProfile() {};
+	virtual	AITYPES::TProfiles getAIProfileType() const { return AITYPES::BOT_FOLLOW_POS; }
+	virtual std::string getOneLineInfoString() const { return std::string("follow_player group profile"); }
+	//@}
+
+	void	stateChangeProfile() {};
+	bool	destinationReach() const;
+
+	void		addBot			(CBot*	bot) {};
+	void		removeBot		(CBot*	bot) {};
+	CPathCont*	getPathCont		(CBot const*	bot) { return NULL; };
+
+
+protected:
+private:
+	/// the profile type to apply to bot standing between two deplacement
+	AITYPES::TProfiles _BotStandProfileType;
+	/// the profile factory to apply to bot standing between two deplacement
+	IAIProfileFactory*_BotStandProfileFactory;
+
+	CFollowPath::TFollowStatus	_Status;
+	CPathPosition	_PathPos;
+	CPathCont		_PathCont;
+	CAIVector		_LastPos;
+
+	TDataSetRow	_PlayerRow;
+	uint32      _DispersionRadius;
+};
+
+
 //////////////////////////////////////////////////////////////////////////////
 // CGrpProfileIdle                                                          //
 //////////////////////////////////////////////////////////////////////////////
@@ -792,6 +835,10 @@ public:
 	static std::string scriptFactionToFameFaction(std::string name);
 	static std::string fameFactionToScriptFaction(std::string name);
 
+	static bool scriptFactionToFameFactionGreaterThan(std::string name);
+	static sint32 scriptFactionToFameFactionValue(std::string name);
+
+
 private:
 	CAITimer	_checkTargetTimer;
 	bool		bNoAssist;
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index 3803462cd..a85e8fe1c 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -259,7 +259,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<aiInstanceId>
 	std::string botsName;
 	if (args.size()>8) botsName = args[8];
 
-	aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName);
+	aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName, "");
 	
 	return true;
 }
diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
index 5bcb13fca..64c620cb6 100644
--- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp
+++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
@@ -3013,7 +3013,10 @@ public:
 		}	
 
 		if(!_Id)
-			npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say,_Sentence);
+		{
+			ucstring ucstr = _Sentence;
+			npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say, ucstr);
+		}
 		else
 		{
 			if(!_Arg)
diff --git a/code/ryzom/server/src/ai_service/messages.cpp b/code/ryzom/server/src/ai_service/messages.cpp
index 64730a1b7..092ab39f8 100644
--- a/code/ryzom/server/src/ai_service/messages.cpp
+++ b/code/ryzom/server/src/ai_service/messages.cpp
@@ -697,7 +697,8 @@ void CMessages::init()
 	TRANSPORT_CLASS_REGISTER (CReportStaticAIInstanceMsg);
 	TRANSPORT_CLASS_REGISTER (CReportAIInstanceDespawnMsg);
 	TRANSPORT_CLASS_REGISTER (CWarnBadInstanceMsgImp);
-
+	TRANSPORT_CLASS_REGISTER (CCreatureSetUrlMsg);
+	TRANSPORT_CLASS_REGISTER (CChangeCreatureMaxHPMsg)
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureHPMsg);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureModeMsgImp);
 	TRANSPORT_CLASS_REGISTER (CQueryEgs);
@@ -770,10 +771,10 @@ void	CAIAskForInfosOnEntityImp::callback (const std::string &name, NLNET::TServi
 			}
 			break;
 		default:
+			std::vector<std::string> strings = phys->getMultiLineInfoString();
+			msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end());
 			break;
 		}
-		std::vector<std::string> strings = phys->getMultiLineInfoString();
-		msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end());
 	}
 	else
 	{
diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp
index 572a589cb..eabe61fd4 100644
--- a/code/ryzom/server/src/ai_service/nf_grp.cpp
+++ b/code/ryzom/server/src/ai_service/nf_grp.cpp
@@ -1497,6 +1497,41 @@ void setAutoSpawn_f_(CStateInstance* entity, CScriptStack& stack)
 // HP related methods
 /** @page code
 
+@subsection setMaxHP_ff_
+Sets the Max HP level of each bot of the group.
+
+Arguments: f(MaxHp) f(SetFull) ->
+@param[in] MaxHP is the new maximum HP for each bot
+@param[in] SetFull if not 0, will set the HP to the new maximum
+
+@code
+()setMaxHP(50000,1);
+@endcode
+
+*/
+// CGroup
+void setMaxHP_ff_(CStateInstance* entity, CScriptStack& stack)
+{
+	bool  setFull = ((float)stack.top() != 0.f); stack.pop();
+	float maxHp = ((float)stack.top()); stack.pop();
+	
+	CChangeCreatureMaxHPMsg& msgList = CAIS::instance().getCreatureChangeMaxHP();
+	
+	FOREACH(bot, CCont<CBot>, entity->getGroup()->bots())
+	{
+		if (!bot->isSpawned())
+			continue;
+		
+		CSpawnBot* const sbot = bot->getSpawnObj();
+		
+		msgList.Entities.push_back(sbot->dataSetRow());
+		msgList.MaxHp.push_back((uint32)(maxHp));
+		msgList.SetFull.push_back((uint8)(setFull?1:0));
+	}
+}
+
+/** @page code
+
 @subsection setHPLevel_f_
 Sets the current HP level of each bot of the group.
 
@@ -1573,10 +1608,42 @@ void setHPScale_f_(CStateInstance* entity, CScriptStack& stack)
 	}
 }
 
+//----------------------------------------------------------------------------
+// Url related method
+/** @page code
 
+@subsection setUrl_ss_
+Sets the name and url of right-click action
 
+Arguments: s(actionName),s(url) ->
+@param[in] actionName of action when player mouse over
+@param[in] url of action when player mouse over
 
+@code
+()setUrl("Click on Me", "http://www.domain.com/script.php");
+@endcode
 
+*/
+// CGroup
+void setUrl_ss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string url = (std::string)stack.top();stack.pop();	
+	std::string actionName = (std::string)stack.top();stack.pop();	
+	
+	CCreatureSetUrlMsg msg;
+	FOREACH(botIt, CCont<CBot>,	entity->getGroup()->bots())
+	{
+		CSpawnBot* pbot = botIt->getSpawnObj();
+		if (pbot!=NULL)
+		{		
+			msg.Entities.push_back(pbot->dataSetRow());
+		}
+	}
+	
+	msg.ActionName = actionName;
+	msg.Url = url;
+	msg.send(egsString);
+}
 
 
 
@@ -1870,7 +1937,7 @@ Arguments: s(parameterName) ->
 @param[in] parameterName is a the id of the parameter to add
 
 @code
-()addProfileParameter("running"); // équivalent à un parameter "running" dans la primitive du groupe
+()addProfileParameter("running"); // equivalent to "running" parameter in group primitive
 @endcode
 
 */
@@ -1898,7 +1965,7 @@ Arguments: s(parameterName),s(parameterContent) ->
 @param[in] parameterContent is the value of the parameter
 
 @code
-()addProfileParameter("foo", "bar"); // équivalent à un parameter "foo:bar" dans la primitive du groupe
+()addProfileParameter("foo", "bar"); // equivalent to "foo:bar" parameter in group primitive
 @endcode
 
 */
@@ -1927,7 +1994,7 @@ Arguments: s(parameterName),f(parameterContent) ->
 @param[in] parameterContent is the value of the parameter
 
 @code
-()addProfileParameter("foo", 0.5); // équivalent à un parameter "foo:0.5" dans la primitive du groupe
+()addProfileParameter("foo", 0.5); // equivalent to "foo:0.5" parameter in group primitive
 @endcode
 
 */
@@ -4456,6 +4523,37 @@ void setSheet_s_(CStateInstance* entity, CScriptStack& stack)
 	}
 }
 
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection setClientSheet_s_
+Change the client sheet of a creature
+
+Arguments: -> s(sheetName)
+
+@code
+()setClientSheet('ccdeb2');
+
+@endcode
+
+*/
+void setClientSheet_s_(CStateInstance* entity, CScriptStack& stack)
+{
+	string sheetname = stack.top();
+	stack.pop();
+	
+	if (sheetname.find(".creature") == string::npos)
+		sheetname += ".creature";
+
+	FOREACH(itBot, CCont<CBot>, entity->getGroup()->bots())
+	{
+		CBot* bot = *itBot;
+		if (bot)
+		{
+			bot->setClientSheet(sheetname);
+		}
+	}
+}
 
 /****************************************************************************/
 
@@ -4581,6 +4679,62 @@ void setConditionSuccess_f_(CStateInstance* entity, CScriptStack& stack)
 	CAILogicDynamicIfHelper::setConditionSuccess(conditionState);
 }
 
+inline
+static float randomAngle()
+{
+	uint32 const maxLimit = CAngle::PI*2;
+	float val = (float)CAIS::rand32(maxLimit);
+	return val;
+}
+
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection facing_f_
+
+The npc will face the given direction
+
+
+Arguments: f(direction)
+@param[in] direction is the new angle of the bot in radians
+
+@code
+()facing(3.14);
+@endcode
+
+*/
+
+// CStateInstance
+void facing_f_(CStateInstance* entity, CScriptStack& stack)
+{
+	float const theta = (float)stack.top(); stack.pop();
+	CGroup* group = entity->getGroup();
+
+	bool bRandomAngle = false;
+	if (theta > (NLMISC::Pi * 2.0) || theta < (-NLMISC::Pi * 2.0))
+		bRandomAngle = true;
+
+	if (group->isSpawned())
+	{
+		FOREACH(itBot, CCont<CBot>, group->bots())
+		{
+			CBot* bot = *itBot;
+			if (bot)
+			{
+				if (bot->isSpawned())
+				{
+					CSpawnBot *spawnBot = bot->getSpawnObj();
+
+					if (bRandomAngle)
+						spawnBot->setTheta(randomAngle());
+					else
+						spawnBot->setTheta(theta);
+					
+				}
+			}
+		}
+	}
+}
 
 std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 {
@@ -4628,6 +4782,7 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, clearAggroList__);
 	REGISTER_NATIVE_FUNC(functions, setMode_s_);
 	REGISTER_NATIVE_FUNC(functions, setAutoSpawn_f_);
+	REGISTER_NATIVE_FUNC(functions, setMaxHP_ff_);
 	REGISTER_NATIVE_FUNC(functions, setHPLevel_f_);
 	REGISTER_NATIVE_FUNC(functions, setHPScale_f_);
 	REGISTER_NATIVE_FUNC(functions, scaleHP_f_);
@@ -4651,10 +4806,11 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, getEventParam_f_f);
 	REGISTER_NATIVE_FUNC(functions, getEventParam_f_s);
 	REGISTER_NATIVE_FUNC(functions, setSheet_s_);
+	REGISTER_NATIVE_FUNC(functions, setClientSheet_s_);
 	REGISTER_NATIVE_FUNC(functions, setHealer_f_);
 	REGISTER_NATIVE_FUNC(functions, setConditionSuccess_f_);
-
-
+	REGISTER_NATIVE_FUNC(functions, facing_f_);
+	REGISTER_NATIVE_FUNC(functions, setUrl_ss_);
 
 	// Boss functions (custom text)
 	REGISTER_NATIVE_FUNC(functions, phraseBegin__);
@@ -4699,10 +4855,7 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, teleportPlayer_sffff_);
 	REGISTER_NATIVE_FUNC(functions, summonPlayer_fs_);
 
-	
 
-	
-	
 #undef REGISTER_NATIVE_FUNC
 	
 	return functions;
diff --git a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
index d8ae543a5..2ea93b625 100644
--- a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
+++ b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
@@ -462,7 +462,7 @@ Arguments: f(Radius) ->
 @param[in] Radius dispersion of wander activity
 
 @code
-()startWander(100); // Gives a wander activity to the group with dispersion of 100
+()startMoving(100,-100,10); // Moves the group to 100,-100 with radius of 10
 @endcode
 
 */
@@ -501,6 +501,56 @@ void startMoving_fff_(CStateInstance* entity, CScriptStack& stack)
 	return;
 }
 
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection followPlayer_sf_
+Set activity to follow the given player
+
+Arguments: s(PlayerEid) f(Radius) ->
+@param[in] PlayerEid id of player to follow
+@param[in] Radius dispersion of wander activity
+
+@code
+()followPlayer("(0x0002015bb4:01:88:88)",10);
+@endcode
+
+*/
+// Spawned CGroupNpc not in a family behaviour
+void followPlayer_sf_(CStateInstance* entity, CScriptStack& stack)
+{
+	uint32 dispersionRadius = (uint32)(float&)stack.top(); stack.pop();
+	NLMISC::CEntityId playerId = NLMISC::CEntityId((std::string)stack.top());
+	
+	IManagerParent* const managerParent = entity->getGroup()->getOwner()->getOwner();
+	CAIInstance* const aiInstance = dynamic_cast<CAIInstance*>(managerParent);
+	if (!aiInstance)
+		return;
+	
+	if (!entity) { nlwarning("followPlayer failed!"); return; }
+	
+	CGroupNpc* group = dynamic_cast<CGroupNpc*>(entity->getGroup());
+	if (!group)
+	{	nlwarning("followPlayer failed: no NPC group");
+		return;
+	}
+	CSpawnGroupNpc* spawnGroup = group->getSpawnObj();
+	if (!spawnGroup)
+	{	nlwarning("followPlayer failed: no spawned group");
+		return;
+	}
+
+	if (playerId == CEntityId::Unknown)
+	{
+		nlwarning("followPlayer failed: unknown player");
+		DEBUG_STOP;
+		return;
+	}
+
+	spawnGroup->movingProfile().setAIProfile(new CGrpProfileFollowPlayer(spawnGroup, TheDataset.getDataSetRow(playerId), dispersionRadius));
+
+	return;
+}
 
 
 //----------------------------------------------------------------------------
@@ -2179,14 +2229,11 @@ void facing_cscs_(CStateInstance* entity, CScriptStack& stack)
 	//	bot1->setTheta(bot1->pos().angleTo(bot2->pos()));
 }
 
-
 //----------------------------------------------------------------------------
 /** @page code
 
 @subsection npcSay_css_
 
-A new entry of the npc contextual menu will propose to the targeter player to talk to the npc.
-
 Make a npc say a text
 
 There are 3 type of text
@@ -2201,9 +2248,9 @@ Arguments: c(group), s(botname), s(text),  ->
 
 @code
 (@group)group_name.context();
-()emote(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss
-()emote(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug)
-()emote(@group, "bob", "answer_group_no_m"); //phrase id
+()npcSay(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss
+()npcSay(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug)
+()npcSay(@group, "bob", "answer_group_no_m"); //phrase id
 
 @endcode
 
@@ -2214,6 +2261,34 @@ Arguments: c(group), s(botname), s(text),  ->
 #include "game_share/chat_group.h"
 #include "game_share/send_chat.h"
 
+void execSayHelper(CSpawnBot *spawnBot, NLMISC::CSString text, CChatGroup::TGroupType mode = CChatGroup::say)
+{
+	if (spawnBot)
+	{
+		NLMISC::CSString prefix = text.left(4);
+		if (prefix=="DSS_")
+		{
+			
+			NLMISC::CSString phrase = text.right(text.length() - 4);
+			NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false);
+			uint32 scenarioId = atoi(idStr.c_str());
+			forwardToDss(spawnBot->dataSetRow(), mode, phrase, scenarioId);
+			return;
+		}
+		
+		if (prefix=="RAW ")
+		{
+			std::string phrase = text.right(text.length()-4);
+			ucstring ucstr = phrase;
+			npcChatToChannelSentence(spawnBot->dataSetRow(), mode, ucstr);
+			return;
+		}
+
+		//Classic phrase ID
+		npcChatToChannel(spawnBot->dataSetRow(), mode, text);
+	}
+}
+
 void npcSay_css_(CStateInstance* entity, CScriptStack& stack)
 {
 	string text = (string)stack.top(); stack.pop();	
@@ -2224,29 +2299,58 @@ void npcSay_css_(CStateInstance* entity, CScriptStack& stack)
 
 	if (!spawnBot) { return; }
 
+	execSayHelper(spawnBot, text);
+}
 
-	std::string prefix =NLMISC::CSString (text).left(4);
-	if(prefix=="DSS_")
-	{
-		
-		NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4);
-		NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false);
-		uint32 scenarioId;
-		NLMISC::fromString(idStr, scenarioId);
-		forwardToDss(spawnBot->dataSetRow(), CChatGroup::say, phrase, scenarioId);
-		return;
-	}
-	
-	if (prefix=="RAW ")
-	{
-		NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4);
-		npcChatToChannelSentence(spawnBot->dataSetRow(),CChatGroup::say, phrase);
-		return;
-	}
+//----------------------------------------------------------------------------
+/** @page code
 
-	//Classic phrase ID
-	npcChatToChannel(spawnBot->dataSetRow(), CChatGroup::say, text);
-	return;
+@subsection npcSay_ss_
+
+Make a npc say a text
+
+Arguments: s(text), s(mode) ->
+@param[in] text is the text to say. prefix with ID: to use an id
+@param[in] mode is the mode to use (say, shout)
+
+@code
+()npcSay("Hello!","say"); // phrase direcly send to IOS as raw
+()npcSay("ID:answer_group_no_m","shout"); // phrase id
+@endcode
+
+*/
+
+void npcSay_ss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string sMode = (std::string)stack.top(); stack.pop();
+	std::string text = (std::string)stack.top(); stack.pop();
+
+	CChatGroup::TGroupType mode = CChatGroup::say;
+	mode = CChatGroup::stringToGroupType(sMode);
+	CGroup* group = entity->getGroup();
+
+	if (group->isSpawned())
+	{
+		FOREACH(itBot, CCont<CBot>, group->bots())
+		{
+			CBot* bot = *itBot;
+			if (bot)
+			{
+				if (bot->isSpawned())
+				{
+					CSpawnBot *spawnBot = bot->getSpawnObj();
+					std::string prefix = NLMISC::CSString(text).left(3);
+					if (NLMISC::nlstricmp(prefix.c_str(), "id:") == 0) {
+						text = NLMISC::CSString(text).right(text.length()-3);
+						execSayHelper(spawnBot, text, mode);
+					}
+					else {
+						execSayHelper(spawnBot, "RAW " + text, mode);
+					}
+				}
+			}
+		}
+	}
 }
 
 
@@ -2514,6 +2618,7 @@ void rename_s_(CStateInstance* entity, CScriptStack& stack)
 						msgout.serial(row);
 						msgout.serial(name);
 						sendMessageViaMirror("IOS", msgout);
+						bot->setCustomName(name);
 					}
 				}
 			}
@@ -2650,6 +2755,7 @@ std::map<std::string, FScrptNativeFunc> nfGetNpcGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, startMoving_fff_);
 	REGISTER_NATIVE_FUNC(functions, waitInZone_s_);
 	REGISTER_NATIVE_FUNC(functions, stopMoving__);
+	REGISTER_NATIVE_FUNC(functions, followPlayer_sf_);
 	REGISTER_NATIVE_FUNC(functions, wander__);
 	REGISTER_NATIVE_FUNC(functions, setAttackable_f_);
 	REGISTER_NATIVE_FUNC(functions, setPlayerAttackable_f_);
@@ -2687,6 +2793,7 @@ std::map<std::string, FScrptNativeFunc> nfGetNpcGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, rename_s_);
 	REGISTER_NATIVE_FUNC(functions, vpx_s_);
 	REGISTER_NATIVE_FUNC(functions, npcSay_css_);
+	REGISTER_NATIVE_FUNC(functions, npcSay_ss_);
 	REGISTER_NATIVE_FUNC(functions, dssMessage_fsss_);
 	REGISTER_NATIVE_FUNC(functions, despawnBotByAlias_s_);	
 	REGISTER_NATIVE_FUNC(functions, giveReward_ssssc_);
diff --git a/code/ryzom/server/src/ai_service/nf_static.cpp b/code/ryzom/server/src/ai_service/nf_static.cpp
index fa1699b4b..4523d3e1d 100644
--- a/code/ryzom/server/src/ai_service/nf_static.cpp
+++ b/code/ryzom/server/src/ai_service/nf_static.cpp
@@ -1000,8 +1000,8 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack)
 	phraseContent2 += "]}";
 
 	ucstring ucPhraseContent;
-//	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
-	ucPhraseContent = phraseContent2; // iso-8859-1 version
+	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
+	//ucPhraseContent = phraseContent2; // iso-8859-1 version
 	
 	NLNET::CMessage	msgout("SET_PHRASE");
 	msgout.serial(phraseName);
@@ -1009,6 +1009,33 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack)
 	sendMessageViaMirror("IOS", msgout);
 }
 
+void setSimplePhrase_sss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string lang = (std::string)stack.top();
+	stack.pop();
+	std::string phraseContent = (std::string)stack.top();
+	stack.pop();
+	std::string phraseName = (std::string)stack.top();
+	stack.pop();
+	
+	std::string phraseContent2;
+	phraseContent2 += phraseName;
+	phraseContent2 += "(){[";
+	phraseContent2 += phraseContent;
+	phraseContent2 += "]}";
+
+	ucstring ucPhraseContent;
+	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
+	//ucPhraseContent = phraseContent2; // iso-8859-1 version
+	
+	NLNET::CMessage	msgout("SET_PHRASE_LANG");
+	msgout.serial(phraseName);
+	msgout.serial(ucPhraseContent);
+	msgout.serial(lang);
+	sendMessageViaMirror("IOS", msgout);
+}
+
+
 //----------------------------------------------------------------------------
 /** @page code
 
@@ -1330,6 +1357,7 @@ std::map<std::string, FScrptNativeFunc> nfGetStaticNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, getNamedEntityProp_ss_s);
 	REGISTER_NATIVE_FUNC(functions, destroyNamedEntity_s_);
 	REGISTER_NATIVE_FUNC(functions, setSimplePhrase_ss_);
+	REGISTER_NATIVE_FUNC(functions, setSimplePhrase_sss_);
 	REGISTER_NATIVE_FUNC(functions, dataGetVar_s_s);
 	REGISTER_NATIVE_FUNC(functions, dataGetVar_s_f);
 	REGISTER_NATIVE_FUNC(functions, dataSetVar_ss_);
diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.cpp b/code/ryzom/server/src/ai_service/npc_description_msg.cpp
index 70989be8d..ebe7701a7 100644
--- a/code/ryzom/server/src/ai_service/npc_description_msg.cpp
+++ b/code/ryzom/server/src/ai_service/npc_description_msg.cpp
@@ -788,6 +788,13 @@ bool	CNpcChatProfileImp::parseChatArgs(CAIInstance	*aiInstance, const std::strin
 		return	true;
 	}
 	
+	// organization entry
+	if (NLMISC::nlstricmp(keyword, "organization") == 0)
+	{
+		NLMISC::fromString(tail, _Organization);
+		return	true;
+	}
+
 	// if no match found throw an error
 	return false;
 }
@@ -830,4 +837,5 @@ void	TGenNpcDescMsgImp::setChat(const CNpcChatProfileImp& chatProfile)
 	_OptionalProperties		= chatProfile.getOptionalProperties();
 
 	_Outpost					=	chatProfile.getOutpost();
+	_Organization					=	chatProfile.getOrganization();
 }
diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.h b/code/ryzom/server/src/ai_service/npc_description_msg.h
index e29bdfd13..14c94e9b1 100644
--- a/code/ryzom/server/src/ai_service/npc_description_msg.h
+++ b/code/ryzom/server/src/ai_service/npc_description_msg.h
@@ -36,7 +36,7 @@ public:
 	CNpcChatProfileImp(const CNpcChatProfileImp &other0,const CNpcChatProfileImp &other1);
 
 	// interface for setting up chat info 
-	void clear()					{ clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); _OptionalProperties.clear(); }
+	void clear()					{ clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); clearWeb(); _OptionalProperties.clear(); }
 	void clearShopInfo()			
 	{ 
 		_ShopTypes.clear(); 
@@ -56,6 +56,11 @@ public:
 	}
 	void clearCellZones()			{ _CellZones.clear(); }
 	void clearMissions()			{ _Missions.clear(); }
+	void clearWeb()
+	{
+		_WebPage.clear();
+		_WebPageName.clear();
+	}
 	bool add(CAIInstance	*aiInstance, const std::string &chatArgs)	{ return parseChatArgs(aiInstance, chatArgs); }
 	void addMission(uint32 mission)	{ _Missions.push_back(mission); }
 	void clearContextOption()		{ _ContextOptions.clear();  }
diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp
index aabe5889c..03d0fe336 100644
--- a/code/ryzom/server/src/ai_service/script_compiler.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler.cpp
@@ -1083,25 +1083,33 @@ CSmartPtr<const AIVM::CByteCode> CCompiler::compileCode (const std::vector<std::
 	FOREACHC(itArg, TList, sourceCodeLines)
 	{
 		const string &str=*itArg;
-		size_t firstIndex=str.find_first_of("/",0);
-		while (firstIndex!=string::npos)
-		{
-			firstIndex++;
-			if (firstIndex>=str.size())
+		size_t index = str.find("//",0);
+		if (index == string::npos)
+			code += str;
+		else {
+			// We have a potential comment. Now check if it is quoted or not
+			bool inQuote = false;
+			uint i = 0;
+			for (;;)
 			{
-				firstIndex=string::npos;
-				break;
-			}
+				if ('"' == str[i])
+					inQuote = !inQuote;
 
-			if (str.at(firstIndex)=='/')
-			{
-				code+=str.substr(0, firstIndex-1);
-				break;
+				if ( !inQuote && ('/' == str[i]) )
+				{
+					++i;
+					if ('/' == str[i])
+						break;
+
+					code += '/';
+				}
+				code += str[i];
+				++i;
+				if (str.size() == i)
+					break;
 			}
-			firstIndex=str.find_first_of("/",firstIndex);
 		}
-		if (firstIndex==string::npos)
-			code+=str;
+
 		code+="\n "; // additional ..
 	}
 	code+="}";
diff --git a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
index 17bc605c4..dc6b36861 100644
--- a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
@@ -221,10 +221,12 @@ arguments.
 - @ref moveToZone_ss_
 - @ref waitInZone_s_
 - @ref stopMoving__
+- @ref followPlayer_sf_
 - @ref wander__
 - @ref downScaleHP_f_
 - @ref upScaleHP_f_
 - @ref scaleHP_f_
+- @ref setMaxHP_ff_
 - @ref setHPLevel_f_
 - @ref addHP_f_
 - @ref aiAction_s_
diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
index e495319f4..20d79f038 100644
--- a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
+++ b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
@@ -69,7 +69,7 @@ void	CVisualPropertiesInterface::release()
 }
 
 //	set different visual properties for a bot.
-void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow,std::string name)
+void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow, ucstring name)
 {
 	if (!IOSHasMirrorReady)
 		return;
@@ -77,8 +77,6 @@ void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow,std::stri
 	NLNET::CMessage	msgout("CHARACTER_NAME");
 	CEntityId		eid=CMirrors::DataSet->getEntityId(dataSetRow);
 	msgout.serial	(const_cast<TDataSetRow&>(dataSetRow));
-	ucstring uname;
-	uname.fromUtf8(name);	
-	msgout.serial	(uname);	// Daniel: TODO update all name dependencies to ucstring in your service.	
+	msgout.serial	(name);
 	sendMessageViaMirror("IOS",msgout);
 }
diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.h b/code/ryzom/server/src/ai_service/visual_properties_interface.h
index 75d5c5a6d..d814e91da 100644
--- a/code/ryzom/server/src/ai_service/visual_properties_interface.h
+++ b/code/ryzom/server/src/ai_service/visual_properties_interface.h
@@ -39,7 +39,7 @@ public:
 	static void release();
 
 	// set different visual properties for an entity
-	static	void setName(const TDataSetRow&	dataSetRow,std::string name);
+	static	void setName(const TDataSetRow&	dataSetRow, ucstring name);
 	
 //	static void setMode(CAIEntityId id,MBEHAV::EMode mode);
 //	static void setBehaviour(CAIEntityId id,MBEHAV::EBehaviour behaviour);
diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 502128805..44a48d3be 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
 //
 // User Privilege set in the mysql database must be like that ":GM:" or "" or ":GM:ADMIN:" ....
 //
@@ -52,8 +51,6 @@
 #include "game_share/shard_names.h"
 #include "server_share/log_command_gen.h"
 #include "server_share/r2_vision.h"
-#include "server_share/log_item_gen.h"
-#include "server_share/log_character_gen.h"
 
 #include "egs_sheets/egs_sheets.h"
 #include "egs_sheets/egs_static_rolemaster_phrase.h"
@@ -75,6 +72,8 @@
 #include "team_manager/team_manager.h"
 #include "world_instances.h"
 #include "egs_variables.h"
+#include "building_manager/building_manager.h"
+#include "building_manager/building_physical.h"
 #include "player_manager/gm_tp_pending_command.h"
 #include "guild_manager/guild_manager.h"
 #include "guild_manager/guild.h"
@@ -104,6 +103,10 @@
 #include "modules/shard_unifier_client.h"
 #include "modules/client_command_forwarder.h"
 #include "modules/guild_unifier.h"
+#include "server_share/log_command_gen.h"
+#include "server_share/log_item_gen.h"
+#include "server_share/log_character_gen.h"
+#include "server_share/used_continent.h"
 
 //
 // Externs
@@ -162,6 +165,9 @@ AdminCommandsInit[] =
 {
 		// player character accessible commands
 		"teamInvite",						true,
+		"setLeague",						true,
+		"leagueInvite",						true,
+		"leagueKick",						true,
 		"guildInvite",						true,
 		"roomInvite",						true,
 		"roomKick",							true,
@@ -174,6 +180,8 @@ AdminCommandsInit[] =
 		"validateRespawnPoint",				true,
 		"summonPet",						true,
 		"connectUserChannel",				true,
+		"updateTarget",                     true,
+		"resetName",						true,
 
 		// Web commands managment
 		"webExecCommand",					true,
@@ -216,6 +224,7 @@ AdminCommandsInit[] =
 		"allowSummonPet",					true,
 		"setPetAnimalSatiety",				true,
 		"getPetAnimalSatiety",				true,
+		"setPetAnimalName",					true,
 		"taskPass",							true,
 		"setFamePlayer",					true,
 		"guildMOTD",						true,
@@ -230,7 +239,7 @@ AdminCommandsInit[] =
 		"renamePlayerForEvent",				true,
 		"renamePlayer",						true,
 		"renameGuild",						true,
-		"setGuildDescription",				true,
+		"setGuildDescription",				false,
 		"setGuildIcon",						false,
 		"killMob",							true,
 		"changeVar",						true,
@@ -295,12 +304,15 @@ AdminCommandsInit[] =
 		"Position",							true,
 		"Priv",								true,
 		"PriviledgePVP",					true,
+		"FullPVP",							true,
 		"FBT",								true,
 		"RyzomDate",						false,
 		"RyzomTime",						false,
 		"addGuildXp",						false,
 		"setGuildChargePoint",				false,
-
+		"characterInventoryDump",			true,
+		"deleteInventoryItem",				true,
+		"setSimplePhrase",                  false,
 
 		// PUT HERE THE VARIABLE / COMMAND THAT ARE TEMPORARY
 		// remove when message of the day interface is ready
@@ -311,6 +323,8 @@ AdminCommandsInit[] =
 		"EntitiesNoActionFailure",			false,
 		"EntitiesNoCastBreak",				false,
 		"EntitiesNoResist",					false,
+		"lockItem",                         true,
+		"setTeamLeader",                    true,
 		// aggroable state
 		"Aggro",							true,
 
@@ -373,6 +387,15 @@ AdminCommandsInit[] =
 		"eventSetBotURL",					true,
 		"eventSetBotURLName",				true,
 		"eventSpawnToxic",					true,
+		"eventNpcSay",						true,
+		"eventSetBotFacing",                true,
+		"eventGiveControl",					true,
+		"eventLeaveControl",				true,
+
+		"setOrganization",					true,
+		"setOrganizationStatus", 			true,
+
+		"addGuildBuilding",					true,
 };
 
 static vector<CAdminCommand>	AdminCommands;
@@ -387,6 +410,22 @@ static void loadCommandsPrivileges(const string & fileName, bool init);
 void cbRemoteClientCallback (uint32 rid, const std::string &cmd, const std::string &entityNames);
 //
 
+// get AI instance and remove it form the group name
+bool getAIInstanceFromGroupName(string& groupName, uint32& instanceNumber)
+{
+	if (groupName.find("@") != string::npos)
+	{
+		string continent = groupName.substr(0, groupName.find('@'));
+		uint32 nr = CUsedContinent::instance().getInstanceForContinent(continent);
+		if (nr == ~0)
+		{
+			return false;
+		}
+		instanceNumber = nr;
+		groupName = groupName.substr(groupName.find('@'), groupName.size());
+	}
+	return true;
+}
 
 CAdminCommand * findAdminCommand(const string & name)
 {
@@ -432,6 +471,7 @@ void initCommandsPrivileges(const std::string & fileName)
 {
 	H_AUTO(initCommandsPrivileges);
 
+	initSalt();
 	loadCommandsPrivileges(fileName, true);
 }
 
@@ -553,43 +593,46 @@ void initPositionFlags(const std::string & fileName)
 	PositionFlagsFileName = fileName;
 }
 
-string getSalt()
+struct SaltFileLoadCallback: public IBackupFileReceiveCallback
 {
-	if (Salt.empty())
+	std::string FileName;
+
+	SaltFileLoadCallback(const std::string& fileName): FileName(fileName)  {}
+
+	virtual void callback(const CFileDescription& fileDescription, NLMISC::IStream& dataStream)
 	{
-		string fileNameAndPath = Bsi.getLocalPath() + "salt.txt";
-		if (CFile::fileExists(fileNameAndPath))
-		{
-			FILE* f;
-			string fileName;
-
-			// open the file
-			f=fopen(fileNameAndPath.c_str(),"rb");
-			if (f == NULL)
-			{
-				nlinfo("Failed to open file for reading: %s", fileName.c_str() );
-				return false;
-			}
-
-			CSString input;
-			// read the file content into a buffer
-			uint32 size=NLMISC::CFile::getFileSize(f);
-			input.resize(size);
-			uint32 readSize= (uint32)fread(&input[0],1,size,f);
-			fclose(f);
-			Salt = input;
-			return Salt;
-		}
-		return "";
+		// if the file isn't found then just give up
+		DROP_IF(fileDescription.FileName.empty(),"<SaltFileLoadCallback> file not found: "<< FileName, return);
+		
+		dataStream.serial(Salt);
+		nlinfo("Salt loaded : %s", Salt.c_str());
 	}
+};
+
+void initSalt()
+{
+	H_AUTO(initSalt);
+
+	string fileNameAndPath = Bsi.getLocalPath() + "salt_egs.txt";
+	if (CFile::fileExists(fileNameAndPath))
+	{
+		nlinfo("Salt loading : salt_egs.txt");
+		Bsi.syncLoadFile("salt_egs.txt", new SaltFileLoadCallback("salt_egs.txt"));
+	}
+}
+
+const string &getSalt()
+{
+	if (Salt.empty()) Salt = "abcdefghijklmnopqrstuvwxyz0123456";
+
 	return Salt;
 }
 
 void saveSalt(const string salt)
 {
 	Salt = salt;
-	CBackupMsgSaveFile msg("salt.txt", CBackupMsgSaveFile::SaveFile, Bsi );
-	msg.DataMsg.serialBuffer((uint8*)Salt.c_str(), (uint)Salt.size());
+	CBackupMsgSaveFile msg("salt_egs.txt", CBackupMsgSaveFile::SaveFile, Bsi );
+	msg.DataMsg.serial(Salt);
 	Bsi.sendFile(msg);
 }
 
@@ -1087,11 +1130,16 @@ ENTITY_VARIABLE(Position, "Position of a player (in meter) <eid> <posx>,<posy>[,
 			explode (value, string(","), res);
 			if (res.size() >= 2)
 			{
-				x = atoi (res[0].c_str()) * 1000;
-				y = atoi (res[1].c_str()) * 1000;
+				fromString(res[0], x);
+				x *= 1000;
+				fromString(res[1], y);
+				y *= 1000;
 			}
 			if (res.size() >= 3)
-				z = atoi (res[2].c_str()) * 1000;
+			{
+				fromString(res[2], z);
+				z *= 1000;
+			}
 		}
 		else
 		{
@@ -2222,13 +2270,19 @@ NLMISC_COMMAND(addPetAnimal,"Add pet animal to character","<eid> <PetTicket>")
 		{
 			CGameItemPtr item = c->createItemInInventoryFreeSlot(INVENTORIES::bag, 1, 1, ticket);
 			if( item != 0 )
-				c->addCharacterAnimal( ticket, 0, item );
-			return true;
-		}
-		else
-		{
-			log.displayNL("<addPetAnimal> command, unknown pet ticket '%s'", args[1].c_str() );
+			{
+				if ( ! c->addCharacterAnimal( ticket, 0, item ))
+				{
+					item.deleteItem();
+					return false;
+				}
+				return true;
+			}
+
+			log.displayNL("<addPetAnimal> command, cannot create item in bag '%s'", args[1].c_str() );
 		}
+
+		log.displayNL("<addPetAnimal> command, unknown pet ticket '%s'", args[1].c_str() );
 	}
 
 	return false;
@@ -2271,7 +2325,9 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 			if ( addressee )
 			{
 				CHECK_RIGHT( addressee, c );
-				CCharacter::sendDynamicSystemMessage( addressee->getId(), result );
+				SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+				params[0].Literal = trim(result);
+				CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params);
 			}
 			else
 				result += " nameForAnswer not found";
@@ -2283,7 +2339,7 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 	return true;
 }
 
-NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0..3)","<eid> <petIndex> [<nameForAnswer>]")
+NLMISC_COMMAND(getPetAnimalSatiety,"Get the satiety of pet animal (petIndex in 0..3)","<eid> <petIndex> [<nameForAnswer>]")
 {
 	if (args.size () < 2) return false;
 	GET_CHARACTER
@@ -2307,7 +2363,9 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 			if ( addressee )
 			{
 				CHECK_RIGHT( addressee, c );
-				CCharacter::sendDynamicSystemMessage( addressee->getId(), result );
+				SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+				params[0].Literal = trim(result);
+				CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params);
 			}
 			else
 				result += " nameForAnswer not found";
@@ -2318,6 +2376,22 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 	return true;
 }
 
+NLMISC_COMMAND(setPetAnimalName, "Set the name of a pet animal (petIndex in 0..3)","<eid> <petIndex> <name>")
+{
+	if (args.size () < 3) return false;
+	GET_CHARACTER
+
+	if ( c )
+	{
+		uint petIndex;
+		fromString(args[1], petIndex);
+		ucstring customName = args[2];
+		c->setAnimalName(petIndex, customName);
+	}
+
+	return true;
+}
+
 NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0,	Magic = 1,Craft = 2, Harvest = 3)", "<eid> <SP type [0..3]> <nb SP>")
 {
 	if (args.size () < 3) return false;
@@ -2330,7 +2404,8 @@ NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0,	Magi
 		return false;
 	}
 
-	uint32 nbSP = atoi (args[2].c_str());
+	uint32 nbSP;
+	fromString(args[2], nbSP);
 
 	c->addSP( nbSP, type );
 
@@ -3723,7 +3798,7 @@ NLMISC_COMMAND( failMission, "force mission failure", "<CSR id><mission idx>" )
 //----------------------------------------------------------------------------
 NLMISC_COMMAND( progressMission, "force mission progression", "<CSR id><mission idx>[repeat]")
 {
-	if ( args.size() != 2  || args.size() != 3 )
+	if ( args.size() != 2  && args.size() != 3 )
 		return false;
 	GET_CHARACTER;
 
@@ -3964,15 +4039,15 @@ NLMISC_COMMAND (targetInfos, "give infos on the target", "")
 //----------------------------------------------------------------------------
 NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "")
 {
-	CSString str("GM STATUS: ");
+	CSString str("INFO: ");
 	GET_CHARACTER
 	if( c->invulnerableMode() )
 	{
-		str << "INVULNERABLE MODE ";
+		str << "INVULNERABLE_MODE ";
 	}
 	if( c->godMode() )
 	{
-		str << "GOD MODE ";
+		str << "GOD_MODE ";
 	}
 	else
 	{
@@ -3988,31 +4063,29 @@ NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "")
 	{
 		if (IsRingShard)
 		{
-			str << "INVISIBLE(" <<R2_VISION::extractInvisibilityLevel(c->getWhoSeesMe()) << ")";
+			str << "INVISIBLE(" <<R2_VISION::extractInvisibilityLevel(c->getWhoSeesMe()) << ") ";
 		}
 		else
 		{
-			str << "INVISIBLE";
+			str << "INVISIBLE ";
 		}
 	}
 
 	if ( IsRingShard && R2_VISION::extractVisionLevel(c->getWhoSeesMe())!=R2_VISION::VISIBLE )
 	{
-		str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ")";
+		str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ") ";
 	}
 
 	if (c->getAggroableSave())
 	{
-		str << " AGGROABLE";
+		str << "AGGROABLE ";
 	}
 	else
 	{
-		str << " NOT_AGGROABLE";
+		str << "NOT_AGGROABLE ";
 	}
 
-	SM_STATIC_PARAMS_1(params,STRING_MANAGER::literal);
-	params[0].Literal = str;
-	CCharacter::sendDynamicSystemMessage( eid,"LITERAL", params );
+	log.displayNL(str.c_str());
 	return true;
 }
 
@@ -4156,7 +4229,7 @@ ENTITY_VARIABLE(Invisible, "Invisibility of a player")
 }
 
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [every=<delay in secondes>] message","<message>")
+NLMISC_COMMAND(broadcast, "Broadcast a text", "[repeat=<num repeat> or during=<time in seconds>] [every=<delay in seconds>] <message>")
 {
 	if( args.size() < 1 )
 	{
@@ -4231,7 +4304,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 
 	if( message.size() == 0 )
 	{
-		log.displayNL("You must enter a not empty message");
+		log.displayNL("You must enter a message");
 		return false;
 	}
 
@@ -4243,7 +4316,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 
 	if( ( ( repeat > 1 || during > 0 ) && every == 0 ) || ( ( every > during ) && during > 0 ) )
 	{
-		log.displayNL("Can't execute broadcast command, check you'r repeat/during/every parameters");
+		log.displayNL("Can't execute broadcast command, check your repeat/during/every parameters");
 		return false;
 	}
 
@@ -4368,15 +4441,29 @@ NLMISC_COMMAND (connectUserChannel, "Connect to user channels", "<user id> <chan
 			inst->removeFactionChannelForCharacter(channel, c, true);
 		}
 		else
-			log.displayNL("You don't have rights to connect to channel %s", name.c_str());
+		{
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = name;
+			CCharacter::sendDynamicSystemMessage( eid, "EGS_CHANNEL_NO_RIGHTS", params );
+		}
 
 		return true;
 	}
 
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+	params[0].Literal = name;
+	CCharacter::sendDynamicSystemMessage( eid, "EGS_CHANNEL_INVALID_NAME", params );
 	return false;
 
 }
 
+NLMISC_COMMAND (updateTarget, "Update current target", "<user id>")
+{
+	GET_CHARACTER
+	c->updateTarget();
+	return true;
+}
+
 NLMISC_COMMAND (setSalt, "Set Salt", "<dev_eid> <salt>")
 {
 	if (args.size() != 2)
@@ -4392,6 +4479,7 @@ NLMISC_COMMAND (setSalt, "Set Salt", "<dev_eid> <salt>")
 	return true;
 }
 
+// !!! Deprecated !!!
 NLMISC_COMMAND (webAddCommandsIds, "Add ids of commands will be run from webig", "<user id> <bot_name> <web_app_url> <indexes>")
 {
 	if (args.size() != 4)
@@ -4413,6 +4501,7 @@ NLMISC_COMMAND (webAddCommandsIds, "Add ids of commands will be run from webig",
 	return true;
 }
 
+// !!! Deprecated !!!
 NLMISC_COMMAND (webDelCommandsIds, "Del ids of commands", "<user id> <web_app_url>")
 {
 	if (args.size() != 2)
@@ -4435,7 +4524,7 @@ NLMISC_COMMAND (webDelCommandsIds, "Del ids of commands", "<user id> <web_app_ur
 
 CInventoryPtr getInv(CCharacter *c, const string &inv)
 {
-	INVENTORIES::TInventory inventory = INVENTORIES::bag;
+	CInventoryPtr inventoryPtr = NULL;
 	if (!inv.empty())
 	{
 		INVENTORIES::TInventory selectedInv = INVENTORIES::toInventory(inv);
@@ -4450,51 +4539,102 @@ CInventoryPtr getInv(CCharacter *c, const string &inv)
 			case INVENTORIES::pet_animal4:
 			case INVENTORIES::guild:
 			case INVENTORIES::player_room:
-				inventory = selectedInv;
+				inventoryPtr = c->getInventory(selectedInv);
 				break;
 
 			default:
-				inventory = INVENTORIES::bag;
+				// No-op
+				break;
 		}
 	}
-	return c->getInventory(inventory);
+	return inventoryPtr;
 }
 
-NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url> <index> <command> <hmac>")
+NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url> <index> <command> <hmac> [<new_check=0|1>] [<next_step=0|1>] [<send_url=0|1>]")
 {
 
-	if (args.size() != 5)
+	if (args.size() < 5)
 		return false;
 
 	GET_CHARACTER
 
+	bool new_check = false;
+	if (args.size() >= 6 && args[5] == "1")
+		new_check = true;
+
+	bool next_step = false;
+	if (args.size() >= 7 && args[6] == "1")
+		next_step = true;
+
+	bool send_url = false;
+	if (args.size() >= 8 && args[7] == "1")
+		send_url = true;
+
+ 	c->setAfkState(false);
+
 	string web_app_url = args[1];
 	string index = args[2];
+	uint32 iindex;
+	NLMISC::fromString(index, iindex);
 	string command = args[3];
 	string hmac = args[4];
 
-	CInventoryPtr check_inv = c->getInventory(INVENTORIES::bag);
 	vector<string> infos;
 	CGameItemPtr item;
 
-	if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+	if (new_check)
 	{
-		uint item_idx = c->checkWebCommand(web_app_url, index+command, hmac, getSalt());
-		if (item_idx == INVENTORIES::NbBagSlots)
+		uint32 saved_index = c->getWebCommandIndex();
+		if (iindex <= saved_index)
 		{
-			nlwarning("Bad web command check");
+			// Index of command must be higher than last used index to prevent re-use of commands
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_index", getSalt());
+			return false;
+		}
+		if (next_step && (iindex != saved_index+1))
+		{
+			// Next step commands wants an index who follow the last used index.
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_next_index", getSalt());
 			return false;
 		}
 
-		item = check_inv->getItem(item_idx);
-		string cText = item->getCustomText().toString();
-		NLMISC::splitString(cText, "\n", infos);
-
-		vector<string> indexes;
-		NLMISC::splitString(infos[1], ",", indexes);
-
-		if (index != indexes[0])
+		string salt = getSalt();
+		string checksumEid = web_app_url + toString(c->getLastConnectedDate()) + index + command + c->getId().toString();
+		string checksumRowId = web_app_url + toString(c->getLastConnectedDate()) + index + command + toString(c->getEntityRowId().getIndex());
+		string realhmacEid = getHMacSHA1((uint8*)&checksumEid[0], checksumEid.size(), (uint8*)&salt[0], salt.size()).toString();
+		string realhmacRowId = getHMacSHA1((uint8*)&checksumRowId[0], checksumRowId.size(), (uint8*)&salt[0], salt.size()).toString();
+		if (realhmacEid != hmac && realhmacRowId != hmac)
+		{
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_auth", getSalt());
 			return false;
+		}
+	}
+	else
+	{
+		// !!! DEPRECATED !!!
+		CInventoryPtr check_inv = c->getInventory(INVENTORIES::bag);
+		if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+		{
+			uint item_idx = c->checkWebCommand(web_app_url, index+command, hmac, getSalt());
+			if (item_idx == INVENTORIES::NbBagSlots)
+			{
+				nlwarning("Bad web command check");
+				return false;
+			}
+
+			item = check_inv->getItem(item_idx);
+			string cText = item->getCustomText().toString();
+			NLMISC::splitString(cText, "\n", infos);
+
+			vector<string> indexes;
+			NLMISC::splitString(infos[1], ",", indexes);
+
+			if (index != indexes[0])
+				return false;
+		}
 	}
 
 	std::vector<std::string> command_args;
@@ -4514,10 +4654,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		const CSheetId sheetId(command_args[1]);
 		if (sheetId == CSheetId::Unknown)
 			return false;
-		const uint32 quality = (uint32)atoi(command_args[2].c_str());
+		uint32 quality;
+		fromString(command_args[2], quality);
 		if (quality == 0)
 			return false;
-		const uint32 quantity = (uint32)atoi(command_args[3].c_str());
+		uint32 quantity;
+		fromString(command_args[3], quantity);
 		if (quantity == 0)
 			return false;
 
@@ -4526,13 +4668,20 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			selected_inv = command_args[4];
 		CInventoryPtr inventory = getInv(c, selected_inv);
 
+		if (inventory == NULL)
+		{
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_inventory", getSalt());
+			return false;
+		}
+
 		uint32 numberItem = 0;
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem += itemPtr->getStackSize();
 				}
@@ -4541,7 +4690,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if (numberItem < quantity)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
 			return false;
 		}
 
@@ -4551,7 +4701,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem -= inventory->deleteStackItem(i, quantity);
 					if(numberItem == 0)
@@ -4570,13 +4720,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (command_args.size() < 4)
 			return false;
 
-		const CSheetId sheetId(command_args[1]);
-		if (sheetId == CSheetId::Unknown)
-			return false;
-		const uint32 quality = (uint32)atoi(command_args[2].c_str());
+		uint32 quality;
+		fromString(command_args[2], quality);
 		if (quality == 0)
 			return false;
-		const uint32 quantity = (uint32)atoi(command_args[3].c_str());
+		uint32 quantity;
+		fromString(command_args[3], quantity);
 		if (quantity == 0)
 			return false;
 
@@ -4603,14 +4752,44 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 		}
 
-		CGameItemPtr new_item = c->createItem(quality, quantity, sheetId);
+		CGameItemPtr new_item;
+		string sheet = command_args[1];
+
+		if ( sheet.find(".sitem") == string::npos ) // try named item
+		{
+			new_item = CNamedItems::getInstance().createNamedItem(command_args[1], quantity);
+			if (new_item == NULL)
+				return true;
+		}
+		else
+		{
+			const CSheetId sheetId(sheet);
+			if (sheetId == CSheetId::Unknown)
+				return true;
+			new_item = c->createItem(quality, quantity, sheetId);
+		}
 
 		if (!c->addItemToInventory(inventory, new_item))
 		{
 			new_item.deleteItem();
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=cant_add_item", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=cant_add_item", getSalt());
 			return false;
 		}
+
+		ucstring customValue;
+
+		if (command_args.size() == 6 && command_args[5] != "*")
+		{
+			customValue.fromUtf8(command_args[5]);
+			new_item->setCustomName(customValue);
+		}
+
+		if (command_args.size() == 7 && command_args[6] != "*")
+		{
+			customValue.fromUtf8(command_args[6]);
+			new_item->setCustomText(customValue);
+		}
 	}
 	//*************************************************
 	//***************** check_position
@@ -4638,7 +4817,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		nlinfo("max_x = %d, max_y = %d", max_x, max_y);
 		if ((x < min_x || y < min_y || x > max_x || y > max_y))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_position", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_position", getSalt());
 			return false;
 		}
 	}
@@ -4650,8 +4830,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 	{
 		if (command_args.size () != 4) return false;
 
-
-		uint32 factionIndex	= PVP_CLAN::getFactionIndex(PVP_CLAN::fromString(command_args[1]));
+		uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(command_args[1]);
+		if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;
 		sint32 fame = CFameInterface::getInstance().getFameIndexed(c->getId(), factionIndex);
 
 		sint32 value;
@@ -4665,12 +4846,46 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if ((command_args[2] == "below" && fame > value) || (command_args[2] == "above" && fame < value))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_fame", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_fame", getSalt());
 			return false;
 		}
 
 	}
 	
+	//*************************************************
+	//***************** set_fame (need x6000 to change 1 point)
+	//*************************************************
+	else if (command_args[0] == "change_fame")
+	{
+		if (command_args.size () != 4) return false;
+
+		uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(command_args[1]);
+		if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;
+		sint32 fame = CFameInterface::getInstance().getFameIndexed(c->getId(), factionIndex);
+
+		sint32 value;
+		NLMISC::fromString(command_args[3], value);
+
+		if (command_args[2] == "add")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, fame+value, false);
+			nlinfo("fame : %d => %d", fame, fame+value);
+		}
+		else if (command_args[2] == "del")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, fame-value, false);
+			nlinfo("fame : %d => %d", fame, fame-value);			
+		}
+		else if (command_args[2] == "set")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, value, false);
+			nlinfo("fame : %d => %d", fame, value);
+		}
+
+	}
+
 	//*************************************************
 	//***************** check_target	
 	//*************************************************
@@ -4681,7 +4896,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		const CEntityId &target = c->getTarget();
 		if (target == CEntityId::Unknown)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_target", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_target", getSalt());
 			return false;
 		}
 
@@ -4689,14 +4905,16 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() == RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			CSheetId creatureSheetId(command_args[2]);
 			CCreature *creature = CreatureManager.getCreature(target);
 			if (creature == NULL ||  creatureSheetId == CSheetId::Unknown || creatureSheetId != creature->getType())
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_sheet", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_sheet", getSalt());
 				return false;
 			}
 		}
@@ -4704,7 +4922,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() == RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			vector<TAIAlias> aliases;
@@ -4721,7 +4940,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 			if (!found)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_bot", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_bot", getSalt());
 				return false;
 			}
 		}
@@ -4729,13 +4949,15 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() != RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			CEntityBase *entityBase = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[2]));
 			if (entityBase == NULL)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_player", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_player", getSalt());
 				return false;
 			}
 		} else
@@ -4751,7 +4973,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if (!c->haveBrick(CSheetId(command_args[1])))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_brick", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_brick", getSalt());
 			return false;
 		}
 	}
@@ -4773,7 +4996,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_action", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_brick_action", getSalt());
 			return false;
 		}
 	}
@@ -4781,7 +5005,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 	//*************************************************
 	//***************** check_item
 	//*************************************************
-	else if (command_args[0] == "check_item")
+	else if (command_args[0] == "check_item") // sheetid ! quality ! quantity ! iscrafted
 	{
 		if (command_args.size() < 4)
 			return false;
@@ -4796,27 +5020,40 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (quantity == 0)
 			return false;
 
+		bool crafted = false;
+		if (command_args.size() == 5)
+			crafted = (command_args[4] == "1");
+
 		string selected_inv;
 		if (command_args.size() == 5)
 			selected_inv = command_args[4];
 		CInventoryPtr inventory = getInv(c, selected_inv);
 
+		if (inventory == NULL)
+		{
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_inventory", getSalt());
+			return false;
+		}
+
 		uint32 numberItem = 0;
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
-					numberItem += itemPtr->getStackSize();
+					if (!crafted || itemPtr->getCreator() == c->getId())
+						numberItem += itemPtr->getStackSize();
 				}
 			}
 		}
 
 		if (numberItem < quantity)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
 			return false;
 		}
 	}
@@ -4852,7 +5089,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			(command_args[2] == "attack" && outpost->getState() != OUTPOSTENUMS::AttackRound) ||
 			(command_args[2] == "defend" && outpost->getState() != OUTPOSTENUMS::DefenseRound))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc="+command_args[2], getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc="+command_args[2], getSalt());
 			return false;
 		}
 	}
@@ -4869,11 +5107,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		sint32 y = c->getY();
 		sint32 orientation = 6666; // used to specify a random orientation
 
-		uint32 nbBots = NLMISC::atoui(command_args[1].c_str());
+		uint32 nbBots;
+		fromString(command_args[1], nbBots);
 		if (nbBots<=0)
 		{
 			log.displayNL("invalid bot count");
-			return true;
+			return false;
 		}
 
 		NLMISC::CSheetId sheetId(command_args[2]);
@@ -4885,7 +5124,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		double dispersionRadius = 10.;
 		if (command_args.size()>3)
 		{
-			dispersionRadius = atof(command_args[3].c_str());
+			fromString(command_args[3], dispersionRadius);
 			if (dispersionRadius < 0.)
 				return true;
 		}
@@ -4910,15 +5149,34 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (botsName == "*")
 			botsName.clear();
 
-		if (command_args.size()>6)
+		if (command_args.size() > 7)
 		{
-			NLMISC::fromString(command_args[6], x);
-			x = x * 1000;
+			
+			if (command_args[6] != "*") {
+				float userX;
+				NLMISC::fromString(command_args[6], userX);
+				x = (sint32)(userX * 1000);
+			}
+
+			if (command_args[7] != "*") {
+				float userY;
+				NLMISC::fromString(command_args[7], userY);
+				y = (sint32)(userY * 1000);
+			}
 		}
-		if (command_args.size()>7)
+
+		std::string look;
+		if (command_args.size() > 8)
 		{
-			NLMISC::fromString(command_args[7], y);
-			y = y * 1000;
+			look = command_args[8];
+			if (look.find(".creature") == string::npos)
+				look += ".creature";
+		}
+
+		// See if another AI instance has been specified
+		if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+		{
+			return false;
 		}
 
 		CEntityId playerId = c->getId();
@@ -4936,6 +5194,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		msgout.serial(dispersionRadius);
 		msgout.serial(spawnBots);
 		msgout.serial(botsName);
+		msgout.serial(look);
 		CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 	}
 
@@ -4950,6 +5209,13 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		uint32 instanceNumber = c->getInstanceNumber(); 
 		uint32 nbString = (uint32)command_args.size();
 	 
+		// See if it needs another AI instance
+		string botsName = command_args[1];
+		if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+		{
+			return false;
+		}
+
 		CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
 		uint32 messageVersion = 1;
 		msgout.serial(messageVersion);
@@ -4957,8 +5223,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		string command = command_args[0];
 		msgout.serial(command);
-		string botEid = command_args[1];
-		msgout.serial(botEid);
+		msgout.serial(botsName);
 		for (uint32 i=2; i<nbString; ++i)
 		{
 			string arg = command_args[i]+";";
@@ -4967,6 +5232,53 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 	}
 
+	//*************************************************
+	//***************** change_hair
+	//*************************************************
+
+	else if (command_args[0] == "change_hair")
+	{
+		if (command_args.size () != 3) return false;
+
+		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
+
+		CSheetId sheetId(command_args[2]);
+
+		const CStaticItem * form = CSheets::getForm(sheetId);
+		if (form == NULL)
+		{
+			nlwarning("unknown item : '%s'", sheetId.toString().c_str());
+			return true;
+		}
+
+		if (form->Type != ITEM_TYPE::HAIR_MALE && form->Type != ITEM_TYPE::HAIR_FEMALE)
+		{
+			nlwarning("'%s' is not a haircut item", sheetId.toString().c_str());
+			return true;
+		}
+
+		uint32 hairValue = CVisualSlotManager::getInstance()->sheet2Index(form->SheetId, SLOTTYPE::HEAD_SLOT);
+		if (target->setHair(hairValue))
+		{
+			target->resetHairCutDiscount();
+		}
+	}
+
+	//*************************************************
+	//***************** change_hair_color
+	//*************************************************
+
+	else if (command_args[0] == "change_hair_color") {
+		if (command_args.size () != 3) return false;
+
+		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
+
+		uint32 value;
+		fromString(command_args[2], value);
+
+		target->setHairColor(value);
+	}
+
 	//*************************************************
 	//***************** change_vpx
 	//*************************************************
@@ -4978,7 +5290,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
 
 		string name = command_args[2];
-		uint32 value = (uint32)atoi(command_args[3].c_str());
+		
+		uint32 value;
+		fromString(command_args[3], value);
 
 		if(target && target->getEnterFlag())
 		{
@@ -5105,7 +5419,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_vpx_def", getSalt());
 		}
 	}
 	//*************************************************
@@ -5122,25 +5437,489 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		msgout.serial(name);
 		sendMessageViaMirror("IOS", msgout);
 	}
-	else
-		return false;
 
+	//*************************************************
+	//***************** teleport
+	//*************************************************
 
-	if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+	else if (command_args[0] == "teleport")
 	{
-		string::size_type pos = infos[1].find(",");
-		if (pos!=string::npos && pos!=(infos[1].length()-1))
+		// args: x y z [t]
+		if (command_args.size () < 4 ||
+			command_args.size () > 5 ) return false;
+
+		sint32 x;
+		sint32 y;
+		sint32 z;
+		float  t;
+		fromString(command_args[1], x);
+		fromString(command_args[2], y);
+		fromString(command_args[3], z);
+		if (command_args.size() > 4)
 		{
-			item->setCustomText(ucstring(infos[0]+"\n"+infos[1].substr(pos+1)));
+			fromString(command_args[4], t);
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
+			t = c->getState().Heading;
+		}
+
+		NLNET::CMessage msgout( "TELEPORT_PLAYER" );
+		msgout.serial( const_cast<CEntityId &>(c->getId()) );
+		msgout.serial( const_cast<sint32 &>(x) );
+		msgout.serial( const_cast<sint32 &>(y) );		
+		msgout.serial( const_cast<sint32 &>(z) );		
+		msgout.serial( const_cast<float &>(t) );		
+		sendMessageViaMirror( "EGS", msgout );	
+	}
+
+	//*************************************************
+	//***************** rename_animal
+	//*************************************************
+	else if (command_args[0] == "rename_animal")
+	{
+		if (command_args.size () < 3) return false;
+
+		uint petIndex = atoi( command_args[1].c_str() );
+		ucstring customName = ucstring(command_args[2]);
+		c->setAnimalName(petIndex, customName);
+	}
+	
+	//*************************************************
+	//***************** organization
+	//*************************************************
+	else if (command_args[0] == "organization")
+	{
+		if (command_args.size () < 3) return false;
+
+		string action = command_args[1]; // change, add_points, set_status, add_status
+		sint32 value;
+		fromString(command_args[2], value);
+		
+		if (action == "change" && value >= 0)
+			c->setOrganization((uint32)value);
+		else if (action == "add_points")
+			c->changeOrganizationPoints(value);
+		else if (action == "set_status" && value >= 0)
+			c->setOrganizationStatus(value);
+		else if (action == "add_status")
+			c->changeOrganizationStatus(value);
+	}
+		
+	//*************************************************
+	//***************** buildings
+	//*************************************************
+	else if (command_args[0] == "building")
+	{
+		if (command_args.size() < 2) return false;
+
+		string action = command_args[1]; // trigger_in, trigger_out, add_guild_room, add_player_room
+		
+		if (action == "trigger_in" && command_args.size () == 3)
+		{
+			uint32 liftId = atoi(command_args[2].c_str());		
+			CBuildingManager::getInstance()->addTriggerRequest(c->getEntityRowId(), liftId);
+		}
+		else if (action == "trigger_out")
+		{
+			CBuildingManager::getInstance()->removeTriggerRequest(c->getEntityRowId());
+			
+		}
+		else if (action == "add_guild_room" && command_args.size () == 3)
+		{
+			CBuildingPhysicalGuild * building = dynamic_cast<CBuildingPhysicalGuild *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				building->addGuild(c->getGuildId());
+			}
+		}
+		else if (action == "add_player_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalPlayer * building = dynamic_cast<CBuildingPhysicalPlayer *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				building->addPlayer(c->getId());
+			}
+		}
+		else if (action == "buy_guild_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalGuild * building = dynamic_cast<CBuildingPhysicalGuild *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				CGuild * guild = CGuildManager::getInstance()->getGuildFromId(c->getGuildId());
+				if (guild != NULL)
+				{
+					guild->setBuilding(building->getAlias());
+				}
+			}
+		}
+		else if (action == "buy_player_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalPlayer * building = dynamic_cast<CBuildingPhysicalPlayer *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				CBuildingManager::getInstance()->buyBuilding(c->getId(), building->getAlias());
+			}
+		}
+	}	
+	
+	//*************************************************
+	//***************** Skill
+	//*************************************************
+	
+	else if (command_args[0] == "skill")
+	{
+		if (command_args.size() < 4) return false;
+		
+		string action = command_args[1]; // check, best, add_xp
+		
+		if (action == "check")
+		{
+			SKILLS::ESkills skillEnum = SKILLS::toSkill( command_args[2] );
+			uint32 wantedValue;
+			fromString(command_args[3], wantedValue);
+			
+			if (c->getSkillValue(skillEnum) < wantedValue) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_skill", getSalt());
+				return true;
+			}
+		}
+		else if (action == "best")
+		{
+			SKILLS::ESkills skillEnum = SKILLS::toSkill( command_args[2] );
+			uint32 wantedValue;
+			fromString(command_args[3], wantedValue);
+			
+			if (c->getBestChildSkillValue(skillEnum) < wantedValue) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_best_skill", getSalt());
+				return true;
+			}
+		}
+		else if (action == "add_xp")
+		{
+			double xp;
+			fromString(command_args[3], xp);
+			c->addXpToSkill(xp, command_args[2]);
+		}
+	}
+	
+	//*************************************************
+	//***************** Money
+	//*************************************************
+	
+	else if (command_args[0] == "money")
+	{
+		if (command_args.size() < 3) return false;
+		
+		string action = command_args[1]; // check, give, spend
+		
+		if (action == "check")
+		{
+			uint64 wantedMoney;
+			fromString(command_args[2], wantedMoney);
+			if (c->getMoney() < wantedMoney) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_money", getSalt());
+				return true;
+			}
+		}
+		else if (action == "give")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			c->giveMoney(money);
+		}
+		else if (action == "spend")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			c->spendMoney(money);
+		}
+	}
+
+	//*************************************************
+	//***************** Guild
+	//*************************************************
+
+	else if (command_args[0] == "guild")
+	{
+		if (command_args.size() < 3) return false;
+		
+		CGuild * guild = CGuildManager::getInstance()->getGuildFromId(c->getGuildId());
+		if (guild == NULL)
+		{
+			if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_guild", getSalt());
+			return true;
+		}
+		
+		string action = command_args[1]; // check, give, spend
+		
+		if (action == "check_money")
+		{
+			uint64 wantedMoney;
+			fromString(command_args[2], wantedMoney);
+			if (guild->getMoney() < wantedMoney) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_money", getSalt());
+				return true;
+			}
+		}
+		else if (action == "money_give")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			guild->addMoney(money);
+		}
+		else if (action == "money_spend")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			guild->spendMoney(money);
+		}
+		else if (action == "check_rank")
+		{
+			CGuildMember * member = guild->getMemberFromEId(c->getId());
+			if ( member == NULL )
+			{
+				return false;
+			}
+
+			EGSPD::CGuildGrade::TGuildGrade wanted_grade = EGSPD::CGuildGrade::fromString(command_args[2]);
+			if (wanted_grade == EGSPD::CGuildGrade::Unknown)
+				return false;
+
+			EGSPD::CGuildGrade::TGuildGrade memberGrade = member->getGrade();
+			if( memberGrade > wanted_grade)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_rank", getSalt());
+				return true;
+			}
+		}
+		
+	}
+
+	//*************************************************
+	//***************** Resets
+	//*************************************************
+
+	else if (command_args[0] == "reset")
+	{
+		if (command_args.size() < 2) return false;
+		
+		string action = command_args[1]; // pvp, powers
+		
+		if (action == "pvp")
+		{
+			c->resetPVPTimers();
+		}
+		else if (action == "powers")
+		{
+			c->resetPowerFlags();
+		}
+	}
+
+	//*************************************************
+	//***************** Faction Points
+	//*************************************************
+
+	else if (command_args[0] == "faction_points")
+	{
+		if (command_args.size() < 4) return false;
+		
+		string action = command_args[1]; // check, set, add, remove
+		
+		
+		PVP_CLAN::TPVPClan clan = PVP_CLAN::fromString(command_args[2]);
+		if ((clan < PVP_CLAN::BeginClans) || (clan > PVP_CLAN::EndClans))
+		{
+			return false;
+		}
+
+		uint32 value;
+		fromString(command_args[3], value);
+		
+		if (action=="check")
+		{
+			if (c->getFactionPoint(clan) < value)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_faction_points", getSalt());
+			}
+		}
+		else if (action=="set")
+		{
+			c->setFactionPoint(clan, value, true);
+		}
+		else if (action=="add")
+		{
+			c->setFactionPoint(clan, c->getFactionPoint(clan)+value, true);
+		}
+		else if (action=="remove")
+		{
+			if (c->getFactionPoint(clan) < value)
+				c->setFactionPoint(clan, 0, true);
+			else
+				c->setFactionPoint(clan, c->getFactionPoint(clan)-value, true);
+		} 
+	}
+
+	//*************************************************
+	//***************** Pvp Points
+	//*************************************************
+
+	else if (command_args[0] == "pvp_points")
+	{
+		if (command_args.size() < 3) return false;
+
+		string action = command_args[1]; // check, set, add, remove
+
+		uint32 value;
+		fromString(command_args[2], value);
+
+		if (action=="check")
+		{
+			if (c->getPvpPoint() < value)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_pvp_points", getSalt());
+			}
+		}
+		else if (action=="set")
+		{
+			c->setPvpPoint(value);
+		}
+		else if (action=="add")
+		{
+			c->setPvpPoint(c->getPvpPoint()+value);
+		}
+		else if (action=="remove")
+		{
+			c->setPvpPoint(c->getPvpPoint()-value);
+		}
+	}
+
+	//*************************************************
+	//***************** missions
+	//*************************************************
+
+	else if (command_args[0] == "mission") // Please set params before spawn mission
+	{
+		if (command_args.size() < 3)
+			return false;
+
+		string action = command_args[1]; // spawn, set_params, add_param
+
+		if (action == "spawn" && command_args.size() == 4)
+		{
+			// try to find the bot name
+			vector<TAIAlias> aliases;
+			CAIAliasTranslator::getInstance()->getNPCAliasesFromName(command_args[2], aliases);
+			if (aliases.empty())
+			{
+				nldebug ("<spawn_mission> No NPC found matching name '%s'", command_args[2].c_str());
+				return false;
+			}
+
+			TAIAlias giverAlias = aliases[0];
+
+			TAIAlias missionAlias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName(command_args[3]);
+
+			if (missionAlias == CAIAliasTranslator::Invalid)
+			{
+				nldebug ("<addMissionByName> No Mission found matching name '%s'", command_args[3].c_str());
+				return false;
+			}
+
+			c->endBotChat();
+
+			std::list< CMissionEvent* > eventList;
+			CMissionManager::getInstance()->instanciateMission(c, missionAlias,	giverAlias, eventList);
+			c->processMissionEventList(eventList,true, CAIAliasTranslator::Invalid);
+		}
+		else if (action == "remove")
+		{
+			TAIAlias missionAlias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName(command_args[2]);
+			c->removeMission(missionAlias, 0);
+			c->removeMissionFromHistories(missionAlias);
+		}
+		else if (action == "add_compass" && command_args.size() == 4)
+		{
+			TVectorParamCheck params(1);
+			sint32 x = 0;
+			sint32 y = 0;
+			string msg;
+			if (command_args[2] == "bot")
+			{
+				vector<TAIAlias> aliases;
+				CAIAliasTranslator::getInstance()->getNPCAliasesFromName(command_args[3], aliases);
+				if (aliases.empty())
+					return false;
+				CCreature * bot = CreatureManager.getCreature(CAIAliasTranslator::getInstance()->getEntityId(aliases[0]));
+				if (bot)
+				{
+					x = bot->getState().X();
+					y = bot->getState().Y();
+					params[0].Type = STRING_MANAGER::bot;
+					params[0].setEIdAIAlias( bot->getId(), aliases[0] );
+					msg = "COMPASS_BOT";
+					uint32 txt = STRING_MANAGER::sendStringToClient(c->getEntityRowId(), msg, params);
+					PlayerManager.sendImpulseToClient(c->getId(), "JOURNAL:ADD_COMPASS_BOT", x, y, txt, bot->getEntityRowId().getCompressedIndex());
+				}
+			}
+			else if (command_args[2] == "place")
+			{
+				CPlace * place = CZoneManager::getInstance().getPlaceFromName(command_args[3]);
+				if (place)
+				{
+					x = place->getCenterX();
+					y = place->getCenterY();
+
+					params[0].Identifier = place->getName();
+					params[0].Type = STRING_MANAGER::place;
+					msg = "COMPASS_PLACE";
+					uint32 txt = STRING_MANAGER::sendStringToClient(c->getEntityRowId(), msg, params);
+					PlayerManager.sendImpulseToClient(c->getId(), "JOURNAL:ADD_COMPASS", x, y, txt);
+				}
+			}
+		}
+		else if (action == "set_params" && command_args.size() == 4)
+		{
+			c->setCustomMissionParams(command_args[2], web_app_url+","+command_args[3]);
+		}
+		else if (action == "add_params" && command_args.size() == 4)
+		{
+			c->addCustomMissionParam(command_args[2], command_args[3]);
 		}
 	}
 	else
 	{
-		nlinfo("OK");
+		return false;
+	}
+
+	if (!new_check)
+	{
+		if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+		{
+			string::size_type pos = infos[1].find(",");
+			if (pos!=string::npos && pos!=(infos[1].length()-1))
+			{
+				item->setCustomText(ucstring(infos[0]+"\n"+infos[1].substr(pos+1)));
+			}
+			else
+			{
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
+			}
+		}
+	}
+	else
+	{
+		c->setWebCommandIndex(iindex);
+		if (send_url)
+			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
 	}
 
 	return true;
@@ -5167,6 +5946,26 @@ ENTITY_VARIABLE (PriviledgePVP, "Priviledge Pvp Mode")
 	}
 }
 
+//----------------------------------------------------------------------------
+ENTITY_VARIABLE (FullPVP, "Full Pvp Mode")
+{
+	ENTITY_GET_CHARACTER
+
+	if (get)
+	{
+		value = c->getFullPVP()?"1":"0";
+	}
+	else
+	{
+		if (value=="1" || value=="on" || toLower(value)=="pvp" || toLower(value)=="true" )
+			c->setFullPVP(true);
+		else if (value=="0" || value=="off" || toLower(value)=="false" )
+			c->setFullPVP(false);
+//		c->setPVPRecentActionFlag();
+		CPVPManager2::getInstance()->setPVPModeInMirror(c);
+		nlinfo ("%s %s now in pvp mode", entity.toString().c_str(), c->getFullPVP()?"is":"isn't");
+	}
+}
 
 //----------------------------------------------------------------------------
 NLMISC_COMMAND(addPosFlag, "add a new position flag", "<csr_eid> <flag_name>")
@@ -6279,8 +7078,10 @@ NLMISC_COMMAND(setFamePlayer, "set the fame value of a player in the given facti
 
 	GET_CHARACTER
 
-	string faction = args[1];
-	uint32 factionIndex	= PVP_CLAN::getFactionIndex( PVP_CLAN::fromString(faction) );
+	uint32 factionIndex	=CStaticFames::getInstance().getFactionIndex(args[1]);
+	if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;	
+
 	sint32 fame;
 	NLMISC::fromString(args[2], fame);
 
@@ -6290,7 +7091,73 @@ NLMISC_COMMAND(setFamePlayer, "set the fame value of a player in the given facti
 
 }
 
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(addGuildBuilding, "sadd a building to guild", "<player eid> <building name>")
+{
+	if (args.size () != 2)
+		return false;
 
+	GET_CHARACTER
+
+	IBuildingPhysical *building = CBuildingManager::getInstance()->getBuildingPhysicalsByName(args[1]);
+
+	if (building == NULL)
+		return true;
+
+	if (c->getGuildId() == 0)
+		return true;
+
+	CBuildingManager::getInstance()->registerGuild( c->getGuildId(), building->getAlias() );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setOrganization, "set the organization of a player to the given faction", "<player eid> <faction>")
+{
+	if (args.size () != 2)
+		return false;
+
+	GET_CHARACTER
+
+	uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(args[1]);
+	if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;	
+
+	c->setOrganization(factionIndex);
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setOrganizationStatus, "set the organization status of a player", "<player eid> <status>")
+{
+	if (args.size () != 2)
+		return false;
+
+	GET_CHARACTER
+
+	sint32 status;
+
+	if (args[1][0] == '+')
+	{
+		NLMISC::fromString(args[1].substr(1), status);
+	}
+	else if (args[1][0] == '-')
+	{
+		NLMISC::fromString(args[1], status);
+	}
+	else
+	{
+		NLMISC::fromString(args[1], status);
+		c->setOrganizationStatus(status);
+		return true;
+	}
+
+	c->changeOrganizationStatus(status);
+
+	return true;
+}
 
 //----------------------------------------------------------------------------
 NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <nbBots> <sheet> [<dispersionRadius=10m> [<spawnBots=true> [<orientation=random|self|-360..360> [<name> [<x> [<y>]]]]]]")
@@ -6303,7 +7170,8 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	sint32 y = c->getY();
 	sint32 orientation = 6666; // used to specify a random orientation
 
-	uint32 nbBots = NLMISC::atoui(args[1].c_str());
+	uint32 nbBots;
+	fromString(args[1], nbBots);
 	if (nbBots<=0)
 	{
 		log.displayNL("invalid bot count");
@@ -6311,9 +7179,9 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	}
 
 	NLMISC::CSheetId sheetId(args[2]);
-	if (sheetId==NLMISC::CSheetId::Unknown)
+	if (sheetId==CSheetId::Unknown)
 		sheetId = args[2] + ".creature";
-	if (sheetId==NLMISC::CSheetId::Unknown)
+	if (sheetId==CSheetId::Unknown)
 	{
 		log.displayNL("invalid sheet id");
 		return true;
@@ -6322,8 +7190,8 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	double dispersionRadius = 10.;
 	if (args.size()>3)
 	{
-		dispersionRadius = atof(args[3].c_str());
-		if (dispersionRadius<0.)
+		fromString(args[3], dispersionRadius);
+		if (dispersionRadius < 0.)
 		{
 			log.displayNL("invalid dispersion radius");
 			return true;
@@ -6332,9 +7200,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 
 	bool spawnBots = true;
 	if (args.size()>4)
-	{
-		NLMISC::fromString(args[4], spawnBots);
-	}
+		fromString(args[4], spawnBots);
 
 	if (args.size()>5)
 	{
@@ -6344,22 +7210,43 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 		}
 		else if (args[5] != "random")
 		{
-			NLMISC::fromString(args[5], orientation);
+			fromString(args[5], orientation);
 			orientation = (sint32)((double)orientation / 360.0 * (NLMISC::Pi * 2.0) * 1000.0);
 		}
 	}
 
 	std::string botsName;
 	if (args.size()>6) botsName = args[6];
-	if (args.size()>7)
+	if (botsName == "*")
+			botsName.clear();
+
+	if (args.size() > 8)
 	{
-		NLMISC::fromString(args[7], x);
-		x = x * 1000;
+		if (args[7] != "*") {
+			float userX;
+			NLMISC::fromString(args[7], userX);
+			x = (sint32)(userX * 1000);
+		}
+
+		if (args[8] != "*") {
+			float userY;
+			NLMISC::fromString(args[8], userY);
+			y = (sint32)(userY * 1000);
+		}
 	}
-	if (args.size()>8)
+
+	std::string look;
+	if (args.size() > 9)
 	{
-		NLMISC::fromString(args[8], y);
-		y = y * 1000;
+		look = args[9];
+		if (look.find(".creature") == string::npos)
+			look += ".creature";
+	}
+
+	// See if another AI instance has been specified
+	if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+	{
+		return true;
 	}
 
 	CEntityId playerId = c->getId();
@@ -6377,6 +7264,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	msgout.serial(dispersionRadius);
 	msgout.serial(spawnBots);
 	msgout.serial(botsName);
+	msgout.serial(look);
 	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 
 	return true;
@@ -6407,15 +7295,21 @@ NLMISC_COMMAND(eventNpcGroupScript, "executes a script on an event npc group", "
 }
 
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid> <botname> <script>")
+NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid> <groupname> <script>")
 {
 	if (args.size () < 3) return false;
 	GET_CHARACTER
 
-	uint32 instanceNumber = c->getInstanceNumber(); 
+	uint32 instanceNumber = c->getInstanceNumber();
 
 	uint32 nbString = (uint32)args.size();
  
+	string botsName = args[1];
+	if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+	{
+		return false;
+	}
+
 	CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
 	uint32 messageVersion = 1;
 	msgout.serial(messageVersion);
@@ -6423,11 +7317,30 @@ NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid>
 
 	string playerEid = args[0];
 	msgout.serial(playerEid);
-	string botEid = args[1];
-	msgout.serial(botEid);
+	msgout.serial(botsName);
 	for (uint32 i=2; i<nbString; ++i)
 	{
 		string arg = args[i]+";";
+
+		// Replace "(eid:<player name>)" with player Entity ID string
+		size_t pos = arg.find("(eid:");
+		while (pos != string::npos)
+		{
+			string s = arg.substr(pos, arg.find(")\"", pos) - pos + 1);
+			if (s.length() > 6)
+			{
+				string name = s.substr(5, s.length() - 6);
+				CCharacter * player = PlayerManager.getCharacterByName( CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), name) );
+				CEntityId id = CEntityId::Unknown;
+				if (player != NULL)
+				{
+					id = player->getId();
+				}
+				strFindReplace(arg, s, id.toString());
+			}
+			pos = arg.find("(eid:");
+		}
+
 		msgout.serial(arg);
 	}
 	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
@@ -7056,11 +7969,113 @@ NLMISC_COMMAND(teamInvite, "send a team invite to a player character", "<eid> <m
 	return true;
 }
 
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(leagueInvite, "send a League invite to a player character", "<eid> <player name>")
+{
+	if(args.size() != 2 )
+		return false;
+
+	CEntityId eId;
+	eId.fromString(args[0].c_str());
+
+	// check user
+	CCharacter * user = PlayerManager.getChar( eId );
+	if (!user)
+	{
+		log.displayNL("<LEAGUE_INVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
+		return true;
+	}
+	if (!user->getEnterFlag())
+	{
+		log.displayNL("'%s' is not entered", eId.toString().c_str());
+		return true;
+	}
+	if (!TheDataset.isAccessible(user->getEntityRowId()))
+	{
+		log.displayNL("'%s' is not valid in mirror", eId.toString().c_str());
+		return true;
+	}
+
+	// Get target
+	CCharacter	*invitedCharacter= PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(user->getHomeMainlandSessionId(), args[1]));
+	if(invitedCharacter == 0 || invitedCharacter->getEnterFlag() == false )
+	{
+		CCharacter::sendDynamicSystemMessage( user->getId(),"TEAM_INVITED_CHARACTER_MUST_BE_ONLINE" );
+		return true;
+	}
+
+	// Join
+	user->setAfkState(false);
+	TeamManager.joinLeagueProposal( user, invitedCharacter->getId() );
+
+	return true;
+}
 
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(resetPVPTimers, "reset the pvp timers of a player", "<CSR eId><player name>")
+NLMISC_COMMAND(leagueKick, "kick a player character from league", "<eid> <member name>")
 {
-	if ( args.size() < 1 )
+	if(args.size() != 2 )
+		return false;
+
+	CEntityId eId;
+	eId.fromString(args[0].c_str());
+
+	// check user
+	CCharacter * user = PlayerManager.getChar( eId );
+	if (!user)
+	{
+		log.displayNL("<LEAGUE_INVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
+		return true;
+	}
+	if (!user->getEnterFlag())
+	{
+		log.displayNL("'%s' is not entered", eId.toString().c_str());
+		return true;
+	}
+	if (!TheDataset.isAccessible(user->getEntityRowId()))
+	{
+		log.displayNL("'%s' is not valid in mirror", eId.toString().c_str());
+		return true;
+	}
+
+	// Get target
+	CCharacter	*invitedCharacter= PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(user->getHomeMainlandSessionId(), args[1]));
+	if(invitedCharacter == 0 || invitedCharacter->getEnterFlag() == false )
+	{
+		CCharacter::sendDynamicSystemMessage( user->getId(),"TEAM_INVITED_CHARACTER_MUST_BE_ONLINE" );
+		return true;
+	}
+
+	// Kick
+	user->setAfkState(false);
+	
+	CTeam * team = TeamManager.getTeam( user->getTeamId() );
+	if (!team)
+		return true;
+	
+	if (team->getLeader() != eId )
+		return true;
+	
+	if (user->getLeagueId() != invitedCharacter->getLeagueId())
+		return true;
+	
+	team = TeamManager.getTeam( invitedCharacter->getTeamId() );
+	if (!team) {
+		invitedCharacter->setLeagueId(DYN_CHAT_INVALID_CHAN);
+	} else {
+		team->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		team->updateLeague();
+	}
+	
+	return true;
+}
+
+
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(resetPVPTimers, "Reset the pvp timers of a player", "<CSR eId><player name>")
+{
+	if ( args.size() < 2 )
 		return false;
 
 	GET_CHARACTER
@@ -7194,3 +8209,388 @@ NLMISC_COMMAND(eventSetBotURLName, "changes the url name of a bot", "<bot eid> <
 
 	return true;
 }
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventNpcSay, "have a bot say a text", "<bot eid> <text to say> <optional mode ('say', 'shout'...)> ")
+{
+	if (args.size() < 2 || args.size() > 3) return false;
+	GET_ENTITY
+
+	string text(args[1]);
+
+	CChatGroup::TGroupType mode = CChatGroup::say;
+	if (args.size() == 3)
+	{
+		mode = CChatGroup::stringToGroupType(args[2]);
+	}
+
+	std::string prefix = NLMISC::CSString(text).left(3);
+	if (NLMISC::nlstricmp(prefix.c_str(), "ID:") == 0)
+	{
+		NLMISC::CSString phrase = NLMISC::CSString(text).right(text.length()-3);
+		npcChatToChannel(e->getEntityRowId(), mode, phrase);
+	}
+	else
+	{
+		ucstring ucstr = text;
+		npcChatToChannelSentence(e->getEntityRowId(), mode, ucstr);
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventSetBotFacing, "Set the direction in which a bot faces", "<bot eid> <angle 0-360|random> [<whole group (0,1)>]")
+{
+	if (args.size () < 2) return false;
+	GET_ENTITY
+
+	float orientation = 0;
+	std::string param = args[1];
+	if (param == "random")
+	{
+		orientation = 6666; // used to specify a random orientation
+	}
+	else
+	{
+		NLMISC::fromString(args[1], orientation);
+		orientation = (orientation / 360.0 * (NLMISC::Pi * 2.0));
+	}
+
+
+	std::vector<std::string> args2;
+
+	if (args.size() == 3 && args[3] != "0")
+	{
+		// Do the whole group
+		args2.push_back(args[0]);
+		args2.push_back(NLMISC::toString("()facing(%f);", orientation));
+	}
+	else
+	{
+		// This bot only
+		TAIAlias alias = CAIAliasTranslator::getInstance()->getAIAlias(eid);
+		args2.push_back(args[0]);
+		args2.push_back(NLMISC::toString("()facing(\"%s\",%f);", NLMISC::toString(alias).c_str(), orientation));
+	}
+
+	uint32 instanceNumber = e->getInstanceNumber();
+	uint32 nbString = args2.size();
+
+	CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
+	uint32 messageVersion = 1;
+	msgout.serial(messageVersion);
+	msgout.serial(nbString);
+	for (uint32 i=0; i<nbString; ++i)
+	{
+		string arg = args2[i];
+		msgout.serial(arg);
+	}
+	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
+
+	return true;
+}
+
+
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(characterInventoryDump, "Dump character inventory info", "<eid> <inventory> [<from slot> <to slot>]")
+{
+	if (args.size () < 2)
+	{
+		log.displayNL("Invalid number of parameters. Parameters: <inventory> [<from slot> <to slot>]");
+		return false;
+	}
+	GET_CHARACTER
+
+	string selected_inv = args[1];
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL)
+	{
+		log.displayNL("Invalid inventory '%s'.", selected_inv.c_str());
+		return false;
+	}
+
+	uint32 start_slot = 0;
+	uint32 end_slot = inventory->getSlotCount();
+
+	if (args.size() == 4)
+	{
+		fromString(args[2], start_slot);
+		fromString(args[3], end_slot);
+		start_slot = std::max(uint32(0), start_slot);
+		end_slot = std::min(end_slot, inventory->getSlotCount());
+	}
+
+	uint32 j = 0;
+	string msg;
+	for (uint32 i = start_slot; i < end_slot; ++i)
+	{
+		CGameItemPtr itemPtr = inventory->getItem(i);
+		if (itemPtr != NULL)
+		{
+			string sheet = itemPtr->getSheetId().toString();
+			uint32 quality = itemPtr->quality();
+			uint32 stacksize = itemPtr->getStackSize();
+			
+			msg += NLMISC::toString("- Slot %3d: SHEETID: %s    QUALITY: %d   QUANTITY: %d\n", 
+				i,
+				sheet.c_str(),
+				quality,
+				stacksize);
+
+			++j;
+			if ( ! (j % 3)) {
+				log.displayNL(msg.c_str());	
+				msg = "";
+				j = 0;
+			}
+		}
+	}
+
+	log.displayNL("Showing slot %d - %d for inventory '%s':", start_slot, end_slot, selected_inv.c_str());
+	if (msg.length() > 0)
+	{
+		log.displayNL(msg.c_str());
+	}
+	else {
+		log.displayNL("Nothing to display.");
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(deleteInventoryItem, "Delete an item from a characters inventory", "<eid> <inventory> <slot> <sheetname> <quality> <quantity>")
+{
+	if (args.size () < 6)
+	{
+		log.displayNL("Invalid number of parameters. Parameters: <inventory> <slot> <sheetname> <quality> <quantity>");
+		return false;
+	}
+
+	GET_CHARACTER
+
+	string selected_inv = args[1];
+
+	sint32 slot = -1;
+	fromString(args[2], slot);
+
+	string sheet_name = args[3];
+
+	uint32 quality = 0;
+	fromString(args[4], quality);
+
+	uint32 quantity = 0;
+	fromString(args[5], quantity);
+
+	if (sheet_name.find(".") == string::npos)
+		sheet_name += ".sitem";
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL)
+	{
+		log.displayNL("Invalid inventory '%s'.", selected_inv.c_str());
+		return false;
+	}
+
+	if (slot < 0 || quality == 0 || quantity == 0)
+	{
+		log.displayNL("Invalid slot or quantity.");
+		return false;
+	}
+
+	const CGameItemPtr itemPtr = inventory->getItem(slot);
+	if (itemPtr != NULL)
+	{
+		if (itemPtr->getSheetId().toString() == sheet_name &&
+			itemPtr->quality() == quality &&
+			itemPtr->getStackSize() >= quantity)
+		{
+			log.displayNL("Deleted item '%s' in slot %d of inventory '%s'", 
+				itemPtr->getSheetId().toString().c_str(),
+				slot,
+				INVENTORIES::toString(inventory->getInventoryId()).c_str()
+			);
+			inventory->deleteStackItem(slot, quantity);
+			return true;
+		}
+		log.displayNL("Incorrect sheetid, quality, or quantity.");
+		return false;
+	}
+
+	log.displayNL("Invalid slot or item.");
+	return false;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (resetName, "Reset your name; undo a temporary rename", "<user id>")
+{
+	GET_CHARACTER
+	c->registerName();
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (lockItem, "Lock/unlock item in inventory", "<user id> <inventory> <slot> <lock=0,1>")
+{
+	if (args.size () < 4) return false;
+	GET_CHARACTER;
+
+	string selected_inv = args[1];
+	bool lock = (args[3] != "0");
+	sint32 slot = -1;
+	fromString(args[2], slot);
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL) return false;
+
+	if (slot < 0 || slot >= INVENTORIES::NbBagSlots) return false;
+
+	const CGameItemPtr itemPtr = inventory->getItem(slot);
+	if (itemPtr != NULL)
+	{
+		// If some of the stack is locked for trading, cannot owner-lock.
+		if (itemPtr->getNonLockedStackSize() < itemPtr->getStackSize())
+		{
+			// TODO: send error message to client?
+			return false;
+		}
+		itemPtr->setLockedByOwner(lock);
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (setTeamLeader, "Set the leader of the team", "<user id> <member>")
+{
+	if (args.size () < 2) return false;
+	GET_CHARACTER;
+
+	uint8 idx = 0;
+	fromString(args[1], idx);
+
+	CTeam *team = TeamManager.getTeam(c->getTeamId());
+
+	if ( ! team)
+	{
+		nlwarning("<TEAM> Invalid team for user %s",c->getId().toString().c_str() );
+		return false;
+	}
+	if (team->getLeader() != c->getId())
+	{
+		nlwarning("<TEAM> user %s is not leader: cant set leader",c->getId().toString().c_str() );
+		return false;
+	}
+
+	// increment the target index as the leader is not in his own team list
+	++idx;
+	team->setLeader(idx);
+	team->updateMembersDb();
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (setLeague, "Set the League of the team", "<user id> [<name>]")
+{
+	GET_CHARACTER;
+
+	CTeam *team = TeamManager.getTeam(c->getTeamId());
+
+	if (!team)
+	{
+		if (args.size () != 2)
+			c->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		else
+			CCharacter::sendDynamicSystemMessage( c->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return true;
+	}
+	
+	if (team->getLeader() != c->getId())
+	{
+		CCharacter::sendDynamicSystemMessage( c->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return false;
+	}
+
+	if (args.size () == 2)
+		team->setLeague(args[1]);
+	else
+		team->setLeague("");
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventGiveControl, "Give control of entity A to entity B", "<eid> <master eid> <slave eid>")
+{
+	if (args.size() != 3) return false;
+ 
+	CEntityId masterEid(args[1]);
+	CEntityId slaveEid(args[2]);
+	
+	nlinfo("%s takes control of %s", args[1].c_str(), args[2].c_str());
+
+	CMessage msgout("ACQUIRE_CONTROL");
+	msgout.serial( slaveEid );
+	msgout.serial( masterEid );
+	sint32 local = 0;
+	msgout.serial( local );
+	msgout.serial( local );
+	msgout.serial( local );
+	sendMessageViaMirror( "GPMS", msgout );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventLeaveControl, "Leave control of entity", "<eid> <master eid>")
+{
+	if (args.size() != 2) return false;
+ 
+	CEntityId masterEid(args[1]);
+	
+	nlinfo("%s leaves control", args[1].c_str());
+
+	CMessage msgout("LEAVE_CONTROL");
+	msgout.serial( masterEid );
+	sendMessageViaMirror( "GPMS", msgout );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setSimplePhrase, "Set an IOS phrase", "<id> <phrase> [<language code>]")
+{
+	if (args.size() < 2)
+		return false;
+
+	string phraseName = args[0];
+	ucstring phraseContent = phraseName;
+	phraseContent += "(){[";
+	phraseContent += args[1];
+	phraseContent += "]}";
+
+	string msgname = "SET_PHRASE";
+	bool withLang = false;
+	string lang = "";
+	if (args.size() == 3) 
+	{
+		lang = args[2];
+		if (lang != "all")
+		{
+			withLang = true;
+			msgname = "SET_PHRASE_LANG";
+		}
+	}
+
+	NLNET::CMessage	msgout(msgname);
+	msgout.serial(phraseName);
+	msgout.serial(phraseContent);
+	if (withLang)
+		msgout.serial(lang);
+	sendMessageViaMirror("IOS", msgout);
+	return true;
+}
\ No newline at end of file
diff --git a/code/ryzom/server/src/entities_game_service/admin.h b/code/ryzom/server/src/entities_game_service/admin.h
index 59b155451..73b06dbd3 100644
--- a/code/ryzom/server/src/entities_game_service/admin.h
+++ b/code/ryzom/server/src/entities_game_service/admin.h
@@ -43,6 +43,8 @@ struct CAdminCommand
 void initAdmin ();
 void initCommandsPrivileges(const std::string & fileName);
 void initPositionFlags(const std::string & fileName);
+void initSalt();
+const std::string &getSalt();
 
 CAdminCommand * findAdminCommand(const std::string & name);
 
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
index c47246b2e..eacce2cbd 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
@@ -268,6 +268,7 @@ bool CBuildingManager::parsePhysicalBuildings( const NLLIGO::IPrimitive* prim, C
 			else
 			{
 				_BuildingPhysicals.insert( make_pair( alias, building ) );
+				_BuildingPhysicalsName.insert( make_pair( building->getName(), building));
 				return true;
 			}
 		}
@@ -853,18 +854,18 @@ IBuildingPhysical * CBuildingManager::getBuildingPhysicalsByAlias( TAIAlias alia
 //----------------------------------------------------------------------------
 IBuildingPhysical* CBuildingManager::getBuildingPhysicalsByName( const std::string & name )
 {
-	for ( std::map<TAIAlias,IBuildingPhysical*>::iterator it =  _BuildingPhysicals.begin(); it != _BuildingPhysicals.end(); ++it )
+	std::map<std::string,IBuildingPhysical*>::iterator it =  _BuildingPhysicalsName.find( name );
+	if ( it != _BuildingPhysicalsName.end() )
 	{
 		if( (*it).second == NULL )
 		{
 			nlwarning("<BUILDING> NULL building in building maps. Checks should be done at init time");
 			return NULL;
 		}
-		if ( (*it).second->getName() == name )
-			return (*it).second;
+		return (*it).second;
 	}
-	return NULL;
 
+	return NULL;
 }
 
 //----------------------------------------------------------------------------
@@ -1134,3 +1135,9 @@ void CBuildingManager::buyBuildingOption(const NLMISC::CEntityId & userId, uint8
 	}
 }
 
+//----------------------------------------------------------------------------
+void CBuildingManager::buyBuilding(const NLMISC::CEntityId & userId, TAIAlias alias)
+{
+	CCharacter * user = PlayerManager.getChar(userId);
+	user->getRoomInterface().init( user, dynamic_cast<CBuildingPhysicalPlayer*>(getBuildingPhysicalsByAlias(alias)) );
+}
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
index 82189c9fe..c30fbb93e 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
@@ -86,7 +86,7 @@ public:
 	void registerPlayer( CCharacter * user );
 	/// get a building destination from its alias.
 	IBuildingPhysical* getBuildingPhysicalsByAlias( TAIAlias Alias );
-	/// get a building destination from its name. WARNING : slow
+	/// get a building destination from its name.
 	IBuildingPhysical* getBuildingPhysicalsByName( const std::string & name );
 	/// remove a player from a room
 	void removePlayerFromRoom( CCharacter * user );
@@ -122,6 +122,7 @@ public:
 	void buildBuildingTradeList(const NLMISC::CEntityId & userId, uint16 session);
 	/// buy a player flat option
 	void buyBuildingOption(const NLMISC::CEntityId & userId, uint8 idx);
+	void buyBuilding(const NLMISC::CEntityId & userId, TAIAlias alias);
 	//@}
 
 private:
@@ -201,9 +202,12 @@ private:
 	typedef CHashMap< TDataSetRow , CTriggerRequest , TDataSetRow::CHashCode > TTriggerRequestCont;
 	TTriggerRequestCont		_TriggerRequests;
 
-	/// physical buildings by name
+	/// physical buildings by Alias
 	std::map<TAIAlias,IBuildingPhysical*> _BuildingPhysicals;
 
+	/// physical buildings by name
+	std::map<std::string,IBuildingPhysical*> _BuildingPhysicalsName;
+
 	/// room instances
 	struct CRoomInstanceEntry
 	{
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h b/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
index 744848d8b..26f020bc9 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
@@ -109,7 +109,6 @@ void CBuildingPhysicalGuild::addGuild( uint32 guildId )
 {
 	if ( std::find(_Guilds.begin(), _Guilds.end(), guildId) != _Guilds.end() )
 	{
-		nlwarning("<BUILDING> trying to add a guild that is already present in the building, guild id = %u", guildId);
 		return;
 	}
 
diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp
index f654b4a2a..dab42cb18 100644
--- a/code/ryzom/server/src/entities_game_service/client_messages.cpp
+++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp
@@ -815,6 +815,34 @@ void cbClientCombatDodge( NLNET::CMessage& msgin, const std::string &serviceName
 	}
 }
 
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+//		CLIENT:LEAGUE
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//
+void cbClientLeagueJoin( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeague(msgin, serviceName, serviceId);
+}
+
+//
+void cbClientLeagueJoinProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeagueProposal(msgin, serviceName, serviceId);
+}
+
+//
+void cbClientLeagueJoinProposalDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeagueDecline(msgin, serviceName, serviceId);
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //		CLIENT:TEAM
@@ -857,7 +885,8 @@ void cbClientTeamSetSuccessor( NLNET::CMessage& msgin, const std::string &servic
 
 	CEntityId id;
 	uint8 idx;
-	msgin.serial( id,idx );
+	msgin.serial(id);
+	msgin.serial(idx);
 	CCharacter* user = PlayerManager.getChar( id );
 	if ( !user )
 	{
@@ -872,9 +901,17 @@ void cbClientTeamSetSuccessor( NLNET::CMessage& msgin, const std::string &servic
 	}
 	if ( team->getLeader() != id )
 	{
-		nlwarning("<TEAM> user %s is not leader : cant set successor",id.toString().c_str() );
+		nlwarning("<TEAM> user %s is not leader: cant set successor",id.toString().c_str() );
 		return;
 	}
+	if (team->getSuccessor() == id)
+	{
+		nlwarning("<TEAM> user %s already is successor", id.toString().c_str() );
+		return;
+	}
+
+	// increment the target index as the leader is not in its team list
+	++idx;
 	team->setSuccessor( idx );
 
 }
@@ -2370,7 +2407,6 @@ void cbClientWhere( NLNET::CMessage& msgin, const std::string &serviceName, NLNE
 	}\
 }
 
-
 // Send list of connected character name / account to client
 void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId )
 {
@@ -2381,6 +2417,11 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 	msgin.serial( id,opt );
 	const std::vector<CEntityId> * gms = NULL;
 
+	// Make sure opt is not like "A(c)" for "é"
+	ucstring ucopt;
+	ucopt.fromUtf8(opt);
+	opt = ucopt.toString();
+
 	uint nbAnswers = 0;
 
 	// standard who
@@ -2420,7 +2461,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 						&& user->getInstanceNumber() == ch->getInstanceNumber())
 					{
 						params[0].setEId( (*it) );
-						CCharacter::sendDynamicSystemMessage( id,"WHO_REGION_LIST",params );
+						CCharacter::sendDynamicSystemMessage( id,"WHO_REGION_LIST", params );
 						nbAnswers++;
 					}
 				}
@@ -2429,7 +2470,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 
 	}
 	// GM who
-	else if ( NLMISC::nlstricmp( opt.c_str() , "GM" ) == 0)
+	else if ( NLMISC::nlstricmp( opt.c_str(), "GM" ) == 0)
 	{
 		TVectorParamCheck params(1);
 		params[0].Type = STRING_MANAGER::player;
@@ -2476,6 +2517,75 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 			}
 		}
 	}
+	else
+	{
+		TChanID chanID;
+
+		CCharacter * user = PlayerManager.getChar( id );
+		if ( !user )
+		{
+			nlwarning("<WHO>'%s' is invalid", id.toString().c_str() );
+			return;
+		}
+		CPlayer *p = PlayerManager.getPlayer(PlayerManager.getPlayerId(user->getId()));
+		
+		if (NLMISC::nlstricmp( opt.c_str(), "league" ) == 0)
+		{
+			chanID = user->getLeagueId();
+		}
+		else
+		{
+			chanID = DynChatEGS.getChanIDFromName(opt);
+		}
+
+		if (chanID == DYN_CHAT_INVALID_CHAN)
+		{
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_NOT_FOUND" );
+			return;
+		}
+
+		bool havePriv = p->havePriv(":DEV:SGM:GM:");
+		bool hasChannel = false;
+		nbAnswers = 0;
+
+		vector<NLMISC::CEntityId> players;
+		DynChatEGS.getPlayersInChan(chanID, players);
+		ucstring playerNames("");
+		uint32 shardId = CEntityIdTranslator::getInstance()->getEntityShardId(id);
+
+		for (uint i = 0; i < players.size(); i++)
+		{
+			if (players[i] == id)
+				hasChannel = true;
+
+			ucstring name = CEntityIdTranslator::getInstance()->getByEntity(players[i]);
+			if (shardId == CEntityIdTranslator::getInstance()->getEntityShardId(players[i]))
+			{
+				// Same shard, remove shard from name
+				CEntityIdTranslator::removeShardFromName(name);
+			}
+			playerNames += ((i > 0) ? "\n" : "") + name ;
+		}
+
+		if (!hasChannel && !havePriv)
+		{
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = opt;
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_NOT_CONNECTED", params );
+
+			return;
+		}
+
+		if (!playerNames.empty())
+		{
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_INTRO" );
+			//playerNames = "Players in channel \"" + opt + "\":" + playerNames;
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = playerNames;
+			CCharacter::sendDynamicSystemMessage( id, "LITERAL", params );
+			return;
+		}
+	}
 
 	if ( nbAnswers == 0 )
 	{
@@ -3508,9 +3618,9 @@ TUnifiedCallbackItem CbClientArray[]=
 	{ "CLIENT:DUEL:REFUSE",						cbClientDuelRefuse },
 	{ "CLIENT:DUEL:ABANDON",					cbClientDuelAbandon },
 
-	{ "CLIENT:PVP_CHALLENGE:ASK",				cbClientPVPChallengeAsked },
-	{ "CLIENT:PVP_CHALLENGE:ACCEPT",			cbClientPVPChallengeAccept },
-	{ "CLIENT:PVP_CHALLENGE:REFUSE",			cbClientPVPChallengeRefuse },
+	{ "CLIENT:PVP_CHALLENGE:ASK",				cbClientLeagueJoinProposal },
+	{ "CLIENT:PVP_CHALLENGE:ACCEPT",			cbClientLeagueJoin },
+	{ "CLIENT:PVP_CHALLENGE:REFUSE",			cbClientLeagueJoinProposalDecline },
 	{ "CLIENT:PVP_CHALLENGE:ABANDON",			cbClientPVPChallengeAbandon },
 
 //	{ "CLIENT:PVP_VERSUS:CLAN",					cbClientPvpChooseClan },
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
index 87378dc13..361bc188e 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
@@ -145,6 +145,7 @@ CCreature::CCreature() : CEntityBase(true)
 	_TicketFameRestrictionValue = 0;
 	_MaxHitRangeForPC = -1.f;
 
+	_Organization = 0;
 //	_MissionIconFlags.IsMissionStepIconDisplayable = true;
 //	_MissionIconFlags.IsMissionGiverIconDisplayable = true;
 }
@@ -941,6 +942,8 @@ void CCreature::setBotDescription( const CGenNpcDescMsgImp& description )
 
 	_BotChatOutpost = description.getOutpost();
 	
+	_Organization = description.getOrganization();
+
 	bool cosmeticCategory = false;
 	bool tradeCategory = false;
 	bool tpCategory = false;
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature.h b/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
index 3239c734a..a1ea67812 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
@@ -496,6 +496,8 @@ public:
 	const std::string &getWebPage() const {return _WebPage;}
 	const std::string &getWebPageName() const {return _WebPageName;}
 
+	const uint32 getOrganization() const { return _Organization; }
+
 	const NLMISC::CSheetId &getBotChatOutpost() const {return _BotChatOutpost;}
 
 	const std::vector<NLMISC::CSheetId> &getExplicitActionTradeList() const {return _ExplicitActionTradeList;}
@@ -590,6 +592,7 @@ private:
 	NLMISC::CSmartPtr<CMerchant> 	_Merchant;					// smart pointer on CMerchant class of creature
 
 	uint32							_BotChatProgram;			// Program enabled for bot chat
+	uint32							_Organization;				// Organization for bot
 
 	TDataSetRow						_CharacterLeaderIndex;		// The data set row of the beast's leader character if it's in a pack/train
 	std::string						_WelcomePhrase;				// welcome message id of the bot
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
index ebeb904a5..a7a5e8d88 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
@@ -195,6 +195,28 @@ void CCreatureCompleteHealImp::callback(const string &, NLNET::TServiceId sid)
 	}
 }
 
+//--------------------------------------------------------------
+//				CChangeCreatureMaxHPImp ::callback()  
+//--------------------------------------------------------------
+void CChangeCreatureMaxHPImp::callback(const string &, NLNET::TServiceId sid)
+{
+	H_AUTO(CChangeCreatureMaxHPImp);
+	
+	// for each creature, restore full HP
+	for ( uint i = 0; i < Entities.size(); ++i )
+	{
+		CCreature * c = CreatureManager.getCreature( Entities[i] );
+		if ( c )
+		{
+			c->getScores()._PhysicalScores[SCORES::hit_points].Max = MaxHp[i];
+			if (SetFull[i] != 0)
+				c->changeCurrentHp( c->maxHp() - c->currentHp() );
+		}
+	}
+}
+
+
+
 //--------------------------------------------------------------
 //				CChangeCreatureHPImp ::callback()  
 //--------------------------------------------------------------
@@ -229,6 +251,50 @@ void CChangeCreatureHPImp::callback(const string &, NLNET::TServiceId sid)
 	}
 }
 
+
+//--------------------------------------------------------------
+//				CChangeCreatureMaxHPImp ::callback()  
+//--------------------------------------------------------------
+void CCreatureSetUrlImp::callback(const string &, NLNET::TServiceId sid)
+{
+	H_AUTO(CCreatureSetUrlImp);
+
+	// for each creature set url
+	for ( uint i = 0; i < Entities.size(); ++i )
+	{
+		CCreature * c = CreatureManager.getCreature( Entities[i] );
+		if ( c )
+		{
+			uint32 program = c->getBotChatProgram();
+			if(!(program & (1<<BOTCHATTYPE::WebPageFlag)))
+			{
+				if(program != 0)
+				{
+					return;
+				}
+				program |= 1 << BOTCHATTYPE::WebPageFlag;
+				c->setBotChatProgram(program);
+			}
+			
+			const string &wp = c->getWebPage();
+			if(Url == "*") {
+				(string &)wp = "";
+				program &= ~(1 << BOTCHATTYPE::WebPageFlag);
+				c->setBotChatProgram(program);
+				return;
+			}
+			else
+				(string &)wp = Url;
+
+			const string &wpn = c->getWebPageName();
+			(string &)wpn = ActionName;
+
+			return;
+		}
+	}
+}
+
+
 //---------------------------------------------------
 // Constructor
 //
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
index e4e96b3ad..75b40c5c3 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
@@ -71,6 +71,15 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id);
 };
 
+/**
+ * Implementation of the set Max HP message for creatures
+ */
+class CChangeCreatureMaxHPImp : public CChangeCreatureMaxHPMsg
+{
+public:
+	virtual void callback (const std::string &name, NLNET::TServiceId id);
+};
+
 /**
  * Implementation of the change HP message for creatures
  */
@@ -81,6 +90,16 @@ public:
 };
 
 
+/**
+ * Implementation of the change setUrl message for creatures
+ */
+class CCreatureSetUrlImp : public CCreatureSetUrlMsg
+{
+public:
+	virtual void callback (const std::string &name, NLNET::TServiceId id);
+};
+
+
 typedef CHashMap< NLMISC::CEntityId, CCreature *, NLMISC::CEntityIdHashMapTraits> TMapCreatures;
 
 /**
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index 42876cf60..d51e35479 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -3139,7 +3139,10 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
 	node  = parent->getNode( ICDBStructNode::CTextId("DESPAWN"), false );
 	nlassert(node != NULL);
 	_DESPAWN = node;
-	
+
+	node  = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
+	nlassert(node != NULL);
+	_NAME = node;
 
 	// branch init
 	
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.h b/code/ryzom/server/src/entities_game_service/database_plr.h
index 4df8c37a4..b1747cc9c 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.h
+++ b/code/ryzom/server/src/entities_game_service/database_plr.h
@@ -8855,7 +8855,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		ICDBStructNode	*_POS;
 		ICDBStructNode	*_HUNGER;
 		ICDBStructNode	*_DESPAWN;
-		
+		ICDBStructNode	*_NAME;		
 
 	public:
 		void init(ICDBStructNode *parent, uint index);
@@ -9044,7 +9044,24 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _DESPAWN;
 		}
-	
+
+		void setNAME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
+		{
+			_setProp(dbGroup, _NAME, value, forceSending);
+		}
+
+		uint32 getNAME(const CCDBSynchronised &dbGroup)
+		{
+			uint32 value;
+			_getProp(dbGroup, _NAME, value);
+
+			return value;
+		}
+
+		ICDBStructNode *getNAMECDBNode()
+		{
+			return _NAME;
+		}
 	};
 		
 
diff --git a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
index 884c5da98..3c67bfb6f 100644
--- a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
+++ b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
@@ -248,6 +248,23 @@ bool CDynChatEGS::removeSession(TChanID chan,const TDataSetRow &client)
 	return true;
 }
 
+//============================================================================================================
+bool CDynChatEGS::getPlayersInChan(TChanID chanID, std::vector<NLMISC::CEntityId> &players)
+{
+	CDynChatChan *chan = _DynChat.getChan(chanID);
+	if (!chan) return false;	
+		
+	CDynChatSession *currSession = chan->getFirstSession();
+	bool havePlayers = false;
+	while (currSession)
+	{
+		players.push_back(TheDataset.getEntityId(currSession->getClient()->getID()));
+		havePlayers = true;
+		currSession = currSession->getNextChannelSession();
+	}
+	return havePlayers;
+}
+
 
 //============================================================================================================
 void CDynChatEGS::iosSetHistoricSize(TChanID chan, uint32 size)
diff --git a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
index bfa0a376f..ec5239729 100644
--- a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
+++ b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
@@ -76,6 +76,9 @@ public:
 	bool				setWriteRight(TChanID chan, const TDataSetRow &client, bool writeRight);
 	// Set size of historic for a given channel
 	void				setHistoricSize(TChanID chan, uint32 size);
+	// Get list of players in channel
+	bool 				getPlayersInChan(TChanID chanID, std::vector<NLMISC::CEntityId> &players);
+
 	// Resend all channel / sessions to the IOS
 	void				iosConnection();	
 	// Get all channel names (for read only)
@@ -83,6 +86,7 @@ public:
 	const TChanIDToName	&getChanIDToNameMap() const { return _ChanNames.getAToBMap(); }
 	// Get pointer on all channels
 	void				getChans(std::vector<CDynChatChan *> &channels) { _DynChat.getChans(channels); }
+	const TChanID				getNextChanID() const { return _NextChanID; }
 
 	/// Message from a service that need to create a new dynamic channel
 	static void			cbServiceAddChan(NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
index 8139713ef..b075cca34 100644
--- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
+++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
@@ -1382,7 +1382,9 @@ void CPlayerService::init()
 	TRANSPORT_CLASS_REGISTER (CReportAIInstanceDespawnMsgImp);
 	TRANSPORT_CLASS_REGISTER (CWarnBadInstanceMsg);
 	TRANSPORT_CLASS_REGISTER (CCreatureCompleteHealImp);
+	TRANSPORT_CLASS_REGISTER (CChangeCreatureMaxHPImp);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureHPImp);
+	TRANSPORT_CLASS_REGISTER (CCreatureSetUrlImp);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureModeMsg);
 	TRANSPORT_CLASS_REGISTER (CGiveItemRequestMsgImp);
 	TRANSPORT_CLASS_REGISTER (CReceiveItemRequestMsgImp);
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
index 1ea9e4a1f..a0c2026f6 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
@@ -446,6 +446,8 @@ void cbClientReady( CMessage& msgin, const std::string &serviceName, NLNET::TSer
 	c->initAnimalHungerDb();
 
 	c->initFactionPointDb();
+	c->initPvpPointDb();
+	c->initOrganizationInfos();
 
 	c->updateOutpostAdminFlagInDB();
 
@@ -516,17 +518,6 @@ void cbClientReady( CMessage& msgin, const std::string &serviceName, NLNET::TSer
 	// ask backup for offline commands file
 	COfflineCharacterCommand::getInstance()->characterOnline( characterId );
 
-	if( CGameEventManager::getInstance().getChannelEventId() != TChanID::Unknown )
-	{
-		if( c->haveAnyPrivilege() )
-		{
-			DynChatEGS.addSession(CGameEventManager::getInstance().getChannelEventId(), entityIndex, true);
-		}
-		else
-		{
-			DynChatEGS.addSession(CGameEventManager::getInstance().getChannelEventId(), entityIndex, false);
-		}
-	}
 	c->onConnection();
 } // cbClientReady //
 
@@ -680,6 +671,9 @@ void finalizeClientReady( uint32 userId, uint32 index )
 	CPVPManager2::getInstance()->setPVPModeInMirror( c );
 	c->updatePVPClanVP();
 
+	// Add character to event channel if event is active
+	CGameEventManager::getInstance().addCharacterToChannelEvent( c );
+
 	// for GM player, trigger a 'infos' command to remember their persistent state
 	if (!PlayerManager.getPlayer(uint32(c->getId().getShortId())>>4)->getUserPriv().empty())
 		CCommandRegistry::getInstance().execute(toString("infos %s", c->getId().toString().c_str()).c_str(), InfoLog(), true);
@@ -1596,6 +1590,53 @@ void cbJoinTeamProposal( NLNET::CMessage& msgin, const std::string &serviceName,
 } // cbJoinTeamProposal //
 
 
+//---------------------------------------------------
+// cbJoinLeague: join specified League
+//---------------------------------------------------
+void cbJoinLeague( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeague);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+	TeamManager.joinLeagueAccept( charId );
+} // cbJoinLeague //
+
+//---------------------------------------------------
+// cbJoinLeagueDecline: player decline the proposition
+//---------------------------------------------------
+void cbJoinLeagueDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeagueDecline);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+	TeamManager.joinLeagueDecline( charId );
+} // cbJoinLeagueDecline //
+
+
+//---------------------------------------------------
+// cbJoinLeagueProposal: propose a player (current target) to enter the League
+//---------------------------------------------------
+void cbJoinLeagueProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeagueProposal);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+
+	CCharacter *character = PlayerManager.getChar( charId );
+	if (character == NULL || !character->getEnterFlag())
+	{
+		nlwarning("<cbJoinLeagueProposal> Invalid player Id %s", charId.toString().c_str() );
+		return;
+	}
+	character->setAfkState(false);
+	TeamManager.joinLeagueProposal( character, character->getTarget() );
+} // cbJoinLeagueProposal //
+
+
+
 //---------------------------------------------------
 // cbKickTeammate: kick your target from your team
 //---------------------------------------------------
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
index 767d99a99..e284b9ff6 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
@@ -82,6 +82,15 @@ void cbJoinTeamProposal( NLNET::CMessage& msgin, const std::string &serviceName,
 // kick your target from your team
 void cbKickTeammate( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
 
+
+/// callback for JOIN_LEAGUE message
+void cbJoinLeague( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+/// callback for JOIN_LEAGUE_DECLINE message
+void cbJoinLeagueDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+/// callback for JOIN_LEAGUE_PROPOSAL message
+void cbJoinLeagueProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+
+
 // toogle god mode on / off for testing
 //void cbGodMode( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
 
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
index 725aa7493..c4c43534b 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
@@ -791,6 +791,7 @@ void CGameItem::ctor( const CSheetId& sheetId, uint32 recommended, bool destroya
 //	SlotCount = slotCount;
 	_Recommended = recommended;
 	_TotalSaleCycle = 0;
+	_PetIndex = MAX_INVENTORY_ANIMAL;
 
 	_Form = CSheets::getForm( sheetId );
 	if (_Form)
@@ -1146,6 +1147,14 @@ uint32	CGameItem::getNonLockedStackSize()
 		return _StackSize - _LockCount;
 }
 
+void CGameItem::setLockedByOwner(bool value)
+{
+	if (value != _LockedByOwner)
+	{
+		_LockedByOwner = value;
+		callItemChanged(INVENTORIES::TItemChangeFlags(INVENTORIES::itc_lock_state));
+	}
+}
 
 //-----------------------------------------------
 // getCopy :
@@ -1362,6 +1371,8 @@ void CGameItem::clear()
 	_RequiredCharacLevel = 0;
 	_HasPrerequisit= false;
 
+	_LockedByOwner = false;
+
 	_TypeSkillMods.clear();
 	_PhraseId.clear();
 	_CustomText.clear();
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
index a8ab8e197..946e5e041 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
@@ -679,6 +679,9 @@ public :
 	/// set required skill level
 	inline void setRequiredSkillLevel2( uint16 l ) { _RequiredSkillLevel2 = l; }
 
+	bool getLockedByOwner() const { return _LockedByOwner; }
+	void setLockedByOwner(bool value);
+
 	/// get required stat
 	inline CHARACTERISTICS::TCharacteristics getRequiredCharac() const { return _RequiredCharac; }
 	/// set required stat
@@ -706,6 +709,13 @@ public :
 	/// set custom string (for scroll-like items)
 	void setCustomText(const ucstring &val);
 
+	uint8 getPetIndex() const { return _PetIndex; }
+	void setPetIndex(uint8 val) { _PetIndex = val; }
+
+	ucstring getCustomName() const { return _CustomName; }
+	void setCustomName(ucstring val) { _CustomName = val; }
+
+
 protected:
 	friend class CFaberPhrase;
 	// set Default Color (for craft only)
@@ -947,6 +957,9 @@ private:
 	std::vector<CTypeSkillMod>	_TypeSkillMods;
 
 	ucstring			_CustomText;
+	bool                _LockedByOwner;
+	uint8               _PetIndex;
+	ucstring            _CustomName;
 };
 
 /**
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
index aa47b5207..2addffbf1 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
@@ -84,6 +84,10 @@ bool CExchangeView::putItemInExchange(uint32 bagSlot, uint32 exchangeSlot, uint3
 	if (_InterlocutorView != NULL && (!form->DropOrSell && form->Family != ITEMFAMILY::PET_ANIMAL_TICKET))
 		return false;
 
+	// Can't trade items locked by owner
+	if (item->getLockedByOwner())
+		return false;
+
 	if( getCharacter()->isAnActiveXpCatalyser(item) )
 		return false;
 
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
index 5b2dd3eaf..d42fcc703 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
@@ -1066,6 +1066,12 @@ void CCharacterInvView::updateClientSlot(uint32 slot, const CGameItemPtr item)
 		getCharacter()->queryItemPrice( item, price );
 		itemBestStat = item->getCraftParameters() == 0 ? RM_FABER_STAT_TYPE::Unknown : item->getCraftParameters()->getBestItemStat();
 
+		BOTCHATTYPE::TBotChatResaleFlag resaleFlag = (item->durability() == item->maxDurability() ? BOTCHATTYPE::ResaleOk : BOTCHATTYPE::ResaleKOBroken);
+		if (item->getLockedByOwner())
+		{
+			resaleFlag = BOTCHATTYPE::ResaleKOLockedByOwner;
+		}
+
 		INVENTORIES::CItemSlot itemSlot( slot );
 		itemSlot.setItemProp( INVENTORIES::Sheet, item->getSheetId().asInt() );
 		itemSlot.setItemProp( INVENTORIES::Quality, item->quality() );
@@ -1076,7 +1082,7 @@ void CCharacterInvView::updateClientSlot(uint32 slot, const CGameItemPtr item)
 		itemSlot.setItemProp( INVENTORIES::NameId, item->sendNameId(getCharacter()) );
 		itemSlot.setItemProp( INVENTORIES::Enchant, item->getClientEnchantValue() );
 		itemSlot.setItemProp( INVENTORIES::Price, price );
-		itemSlot.setItemProp( INVENTORIES::ResaleFlag, item->durability() == item->maxDurability() ? BOTCHATTYPE::ResaleOk : BOTCHATTYPE::ResaleKOBroken );
+		itemSlot.setItemProp( INVENTORIES::ResaleFlag, resaleFlag );
 		itemSlot.setItemProp( INVENTORIES::ItemClass, item->getItemClass() );
 		itemSlot.setItemProp( INVENTORIES::ItemBestStat, itemBestStat );
 		itemSlot.setItemProp( INVENTORIES::PrerequisitValid, getCharacter()->checkPreRequired( item ) );
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
index a93bdaeb1..715a6ffb6 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
@@ -217,7 +217,7 @@ void CGuild::setBuilding(TAIAlias buildingAlias)
 	if (getBuilding() != CAIAliasTranslator::Invalid)
 	{
 		CBuildingManager::getInstance()->removeGuildBuilding( getId() );
-		_Inventory->clearInventory();
+		//_Inventory->clearInventory();
 	}
 
 	// set the new guild building
@@ -1298,23 +1298,34 @@ uint16 CGuild::getMaxGradeCount(EGSPD::CGuildGrade::TGuildGrade grade)const
 	for ( uint i = 0; i < size; ++i )
 		count+=_GradeCounts[i];
 	
-	if ( grade == EGSPD::CGuildGrade::Leader )
-		return 1;
-	if ( grade == EGSPD::CGuildGrade::HighOfficer )
+	switch (grade)
 	{
-		count *= 5;
-		if ( count %100 == 0 )
-			return count/100;
-		else
-			return count/100 + 1;
-	}
-	if ( grade == EGSPD::CGuildGrade::Officer )
-	{
-		count *= 10;
-		if ( count %100 == 0 )
-			return count/100;
-		else
-			return count/100 + 1;
+		case EGSPD::CGuildGrade::Leader:
+			return 1;
+			break;
+		case EGSPD::CGuildGrade::HighOfficer:
+		{
+			return GuildMaxMemberCount;
+			/*
+			count *= 5;
+			if ( count %100 == 0 )
+				return count/100;
+			else
+				return count/100 + 1;
+			*/
+		}
+		break;
+		case EGSPD::CGuildGrade::Officer:
+		{
+			return GuildMaxMemberCount;
+			/*
+			count *= 10;
+			if ( count %100 == 0 )
+				return count/100;
+			else
+				return count/100 + 1;
+			*/
+		}
 	}
 	return 0xFFFF;
 }
@@ -2238,7 +2249,7 @@ void	IGuild::updateMembersStringIds()
 //-----------------------------------------------------------------------------
 /**
  * This class is used to load old guild inventory, DO NOT BREAK IT!
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
index 3c3e6bed3..4bf404ccf 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
@@ -100,7 +100,7 @@ void CGuildLeaderModule::quitGuild()
 		CGuildMember * member = EGS_PD_CAST<CGuildMember*>( (*it).second );
 		EGS_PD_AST( member );
 		// ignore current leader
-		if ( member->getGrade() == EGSPD::CGuildGrade::Leader )
+		if ( _GuildMemberCore->getId() == member->getId() )
 			continue;
 
 		// check if the current member is the successor
diff --git a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
index 52fd214f9..7c4cb0d7c 100644
--- a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
@@ -230,7 +230,6 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 	if (index < MaxGroupMissionCount)
 	{
 		// Team
-
 		CTeam * team = TeamManager.getRealTeam( user->getTeamId() );
 		if ( !team )
 		{
@@ -249,11 +248,10 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 							userId.toString().c_str(), index, team->getMissions().size());
 			return;
 		}
-		
 
 		CMissionTeam* mission = team->getMissions()[index];
 		nlassert(mission);
-		
+
 		if ( mission->getFinished() == false )
 		{
 			CMissionTemplate * templ = CMissionManager::getInstance()->getTemplate( mission->getTemplateId() );
@@ -271,7 +269,7 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			}
 			set<CEntityId> excluded;
 			excluded.insert( userId );
-			
+
 			team->sendDynamicMessageToMembers( "ABANDON_GROUP_MISSION",TVectorParamCheck(), excluded );
 		}
 		team->removeMission( index, mr_abandon );
@@ -301,7 +299,6 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			return;
 		}
 
-
 		CMissionGuild* mission = guild->getMissions()[index];
 		nlassert(mission);
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
index 31cf1ff0f..2d3a24cf9 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
@@ -1961,7 +1961,6 @@ class CMissionActionRecvMoney : public IMissionAction
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_GUILD_RECV_MONEY",params);
 				}
 			}
-
 		}
 	};
 	uint _Amount;
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
index 4e5023b1a..8fa18d518 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
@@ -48,6 +48,7 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 {
 	struct CSubStep
 	{
+		string		Dynamic;
 		CSheetId	Sheet;
 		uint16		Quantity;
 	};
@@ -56,7 +57,7 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 		_SourceLine = line;
 		_Place = 0xFFFF;
 		bool ret = true;
-		if ( script.size() < 2 || script.size() > 3)
+		if (script.size() < 2 || script.size() > 3)
 		{
 			MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
 			return false;
@@ -68,22 +69,36 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 			_SubSteps.reserve( subs.size() );
 			for ( uint i = 0; i < subs.size(); i++ )
 			{
+				CSubStep subStep;
+
 				std::vector< std::string > args;
 				CMissionParser::tokenizeString( subs[i]," \t", args );
-				if ( args.size() != 2 )
+
+				//// Dynamic Mission Args : #dynamic# <quantity>
+				if ((args.size() == 2) && (args[0] == "#dynamic#"))
 				{
-					MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
-					return false;
+					subStep.Dynamic = missionData.Name;
+					subStep.Quantity = atoi(args[1].c_str());
 				}
-				missionData.ChatParams.push_back( make_pair(args[0],STRING_MANAGER::creature_model) );
-				CSubStep subStep;
-				subStep.Sheet = CSheetId( args[0] + ".creature");
-				if ( subStep.Sheet == CSheetId::Unknown )
+				////
+				else
 				{
-					ret = false;
-					MISLOGERROR1("invalid sheet '%s'", args[0].c_str());
+					if ( args.size() != 2 )
+					{
+						MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
+						return false;
+					}
+					missionData.ChatParams.push_back( make_pair(args[0],STRING_MANAGER::creature_model) );
+				
+					subStep.Dynamic = "";
+					subStep.Sheet = CSheetId( args[0] + ".creature");
+					if ( subStep.Sheet == CSheetId::Unknown )
+					{
+						ret = false;
+						MISLOGERROR1("invalid sheet '%s'", args[0].c_str());
+					}
+					NLMISC::fromString(args[1], subStep.Quantity);
 				}
-				NLMISC::fromString(args[1], subStep.Quantity);
 				_SubSteps.push_back(subStep);
 			}
 			if ( script.size() == 3 )
@@ -104,15 +119,54 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 	}
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		nlinfo("Process Event");
+		string webAppUrl;
+		bool ret = true;
+		_User = PlayerManager.getChar(getEntityIdFromRow(userRow));
+
 		if ( event.Type == CMissionEvent::Kill )
 		{
 			CMissionEventKill & eventSpe = (CMissionEventKill&)event;
 			CCreature * c = CreatureManager.getCreature( event.TargetEntity );
+			CSheetId faunaSheet;
+
+			//// Dynamic Mission Args
+			if (_SubSteps[subStepIndex].Dynamic.empty()) {
+				faunaSheet = _SubSteps[subStepIndex].Sheet;
+			}
+			else
+			{
+				vector<string> params = _User->getCustomMissionParams(_SubSteps[subStepIndex].Dynamic);
+				if (params.size() < 2)
+				{
+					LOGMISSIONSTEPERROR("kill_fauna : invalid dynamic creature");
+					return 0;
+				}
+				else
+				{
+					webAppUrl = params[0];
+					faunaSheet = CSheetId(params[1]);
+					
+					if (params.size() > 2) {
+						string placeStr = CMissionParser::getNoBlankString( params[2] );
+						CPlace * place = CZoneManager::getInstance().getPlaceFromName( placeStr );
+						if ( !place )
+						{
+							ret = false;
+							LOGMISSIONSTEPERROR("kill_fauna : invalid place "+params[2]);
+						}
+						else
+							_Place = place->getId();
+					}
+				}
+				////
+			}
+
 			if ( !c )
 			{
 				LOGMISSIONSTEPERROR("kill_fauna : invalid creature " + toString(event.TargetEntity.getIndex()));
 			}
-			else if ( _SubSteps[subStepIndex].Sheet == c->getType() )
+			else if ( faunaSheet == c->getType() )
 			{
 				if ( _Place != 0xFFFF )
 				{
@@ -126,6 +180,8 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 
 					if ( region && region->getId() == _Place )
 					{
+						if (!webAppUrl.empty())
+							_User->validateDynamicMissionStep(webAppUrl);
 						LOGMISSIONSTEPSUCCESS("kill_fauna");
 						return 1;
 					}
@@ -134,6 +190,8 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 					{
 						if ( places[i] && places[i]->getId() == _Place )
 						{
+							if (!webAppUrl.empty())
+								_User->validateDynamicMissionStep(webAppUrl);
 							LOGMISSIONSTEPSUCCESS("kill_fauna");
 							return 1;
 						}
@@ -142,11 +200,14 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 				}
 				else
 				{
+					if (!webAppUrl.empty())
+						_User->validateDynamicMissionStep(webAppUrl);
 					LOGMISSIONSTEPSUCCESS("kill_fauna");
 					return 1;
 				}
 			}
 		}
+
 		return 0;
 	}
 
@@ -162,41 +223,82 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_FAUNA_";
 		static const std::string stepTextLoc = "MIS_KILL_FAUNA_LOC_";
 		nlassert( _SubSteps.size() == subStepStates.size() );
+		CSheetId faunaSheet;
 		for ( uint i  = 0; i < subStepStates.size(); i++ )
 		{
 			if( subStepStates[i] != 0 )
 			{
-				nbSubSteps++;
-				retParams.push_back(STRING_MANAGER::TParam());
-				retParams.back().Type = STRING_MANAGER::creature_model;
-				retParams.back().SheetId = _SubSteps[i].Sheet;
+				if (_SubSteps[i].Dynamic.empty())
+				{
+					faunaSheet = _SubSteps[i].Sheet;
+				}
+				else
+				{
+					//// Dynamic Mission Args
+					vector<string> params = _User->getCustomMissionParams(_SubSteps[i].Dynamic);
+					if (params.size() < 2)
+					{
+						faunaSheet = CSheetId::Unknown;
+					}
+					else
+					{
+						faunaSheet = CSheetId(params[1]);
+					}
+
+					if ((_Place == 0xFFFF) && (params.size() > 2))
+					{
+						string placeStr = CMissionParser::getNoBlankString( params[2] );
+						CPlace * place = CZoneManager::getInstance().getPlaceFromName( placeStr );
+						if ( !place )
+						{
+							MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+						}
+						else
+							_Place = place->getId();
+					}
+					////
+				}
 				
-				retParams.push_back(STRING_MANAGER::TParam());
-				retParams.back().Type = STRING_MANAGER::integer;
-				retParams.back().Int = subStepStates[i];
+				nbSubSteps++;
+				if (faunaSheet != CSheetId::Unknown)
+				{
+					retParams.push_back(STRING_MANAGER::TParam());
+					retParams.back().Type = STRING_MANAGER::creature_model;
+					retParams.back().SheetId = faunaSheet;
+					
+					retParams.push_back(STRING_MANAGER::TParam());
+					retParams.back().Type = STRING_MANAGER::integer;
+					retParams.back().Int = subStepStates[i];
+				}
 			}
 		}
-		if ( _Place != 0xFFFF )
+		if (faunaSheet != CSheetId::Unknown)
 		{
-			STRING_MANAGER::TParam param;
-			param.Type = STRING_MANAGER::place;
-			CPlace * place = CZoneManager::getInstance().getPlaceFromId(_Place);
-			if ( !place )
+			if ( _Place != 0xFFFF )
 			{
-				MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+				STRING_MANAGER::TParam param;
+				param.Type = STRING_MANAGER::place;
+				CPlace * place = CZoneManager::getInstance().getPlaceFromId(_Place);
+				if ( !place )
+				{
+					MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+				}
+				else
+				{
+					param.Identifier = place->getName();
+					retParams.push_back(param);
+				}
+				textPtr = &stepTextLoc;
 			}
 			else
-			{
-				param.Identifier = place->getName();
-				retParams.push_back(param);
-			}
-			textPtr = &stepTextLoc;
+				textPtr = &stepText;
 		}
 		else
-			textPtr = &stepText;
+			textPtr = &stepTextReact;
 	}
 
 	std::vector< CSubStep > _SubSteps;
@@ -329,6 +431,7 @@ class CMissionStepKillRace : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps, const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_RACE_";
 		static const std::string stepTextLoc = "MIS_KILL_RACE_LOC_";
 
@@ -380,6 +483,7 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 {
 	struct CSubStep
 	{
+		string		Dynamic;
 		TAIAlias	Alias;
 //		NLMISC::TStringId	NpcName;
 	};
@@ -400,9 +504,17 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 			for ( uint i = 0; i < subs.size(); i++ )
 			{
 				CSubStep subStep;
-				subStep.Alias = CAIAliasTranslator::Invalid;
-				if ( !CMissionParser::parseBotName(subs[i],subStep.Alias,missionData) )
-					ret = false;
+				//// Dynamic Mission Args : #dynamic#
+				if (trim(subs[i]) == "#dynamic#") {
+					subStep.Dynamic = missionData.Name;
+				} 
+				////
+				else 
+				{
+					subStep.Alias = CAIAliasTranslator::Invalid;
+					if ( !CMissionParser::parseBotName(subs[i],subStep.Alias,missionData) )
+						ret = false;
+				}
 				_SubSteps.push_back( subStep );
 			}
 			return ret;
@@ -410,6 +522,9 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 	}
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		string webAppUrl;
+		CCharacter * user = PlayerManager.getChar(getEntityIdFromRow(userRow));
+
 		if ( event.Type == CMissionEvent::Kill )
 		{
 			CMissionEventKill & eventSpe = (CMissionEventKill&)event;
@@ -420,18 +535,44 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 			}
 			else
 			{
-				if ( _SubSteps[subStepIndex].Alias != CAIAliasTranslator::Invalid )
+				if (_SubSteps[subStepIndex].Dynamic.empty())
 				{
-					if ( _SubSteps[subStepIndex].Alias == c->getAlias() )
+					if ( _SubSteps[subStepIndex].Alias != CAIAliasTranslator::Invalid )
+					{
+						if ( _SubSteps[subStepIndex].Alias == c->getAlias() )
+						{
+							LOGMISSIONSTEPSUCCESS("kill_npc");
+							return 1;
+						}
+					}
+					else if (  event.TargetEntity == giverRow )
 					{
 						LOGMISSIONSTEPSUCCESS("kill_npc");
 						return 1;
 					}
 				}
-				else if (  event.TargetEntity == giverRow )
+				else
 				{
-					LOGMISSIONSTEPSUCCESS("kill_npc");
-					return 1;
+					//// Dynamic Mission Args								
+					vector<string> params = user->getCustomMissionParams(_SubSteps[subStepIndex].Dynamic);
+					if (params.size() < 2) {
+						LOGMISSIONSTEPERROR("kill_npc : invalid dynamic npc");
+						return 0;
+					}
+					else
+					{
+						webAppUrl = params[0];
+						string name;
+						
+						CAIAliasTranslator::getInstance()->getNPCNameFromAlias(c->getAlias(), name);
+						if ( name == params[1] )
+						{
+							user->validateDynamicMissionStep(webAppUrl);
+							LOGMISSIONSTEPSUCCESS("kill_npc");
+							return 1;
+						}
+					}
+					////
 				}
 			}
 		}
@@ -450,6 +591,7 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps, const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_NPC_";
 		textPtr = &stepText;
 		nlassert( _SubSteps.size() == subStepStates.size() );
@@ -460,10 +602,34 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 				nbSubSteps++;
 				retParams.push_back(STRING_MANAGER::TParam());
 				retParams.back().Type = STRING_MANAGER::bot;
-				if ( _SubSteps[i].Alias != CAIAliasTranslator::Invalid )
-					retParams.back().Int = _SubSteps[i].Alias;
+				if (_SubSteps[i].Dynamic.empty())
+				{
+					if ( _SubSteps[i].Alias != CAIAliasTranslator::Invalid )
+						retParams.back().Int = _SubSteps[i].Alias;
+					else
+						retParams.back().Identifier = "giver";
+				}
 				else
-					retParams.back().Identifier = "giver";
+				{
+					vector<string> params = _User->getCustomMissionParams(_SubSteps[i].Dynamic);
+					if (params.size() < 2)
+					{
+						nlinfo("kill_npc : invalid dynamic npc");
+						textPtr = &stepTextReact;
+						return;
+					}
+					else
+					{
+						vector<TAIAlias> aliases;
+						CAIAliasTranslator::getInstance()->getNPCAliasesFromName( params[1] , aliases );
+						if ( aliases.empty() )
+						{
+							retParams.back().Int = CAIAliasTranslator::Invalid;
+							return;
+						}
+						retParams.back().Int = aliases[0];
+					}
+				}
 			}
 		}
 	}
@@ -891,10 +1057,6 @@ class CMissionStepKillByName : public IMissionStepTemplate
 MISSION_REGISTER_STEP(CMissionStepKillByName,"kill_npc_by_name");
 
 
-
-
-
-
 // ----------------------------------------------------------------------------
 class CMissionStepKillPlayer : public IMissionStepTemplate
 {
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
index 41a4e98b0..c1495b128 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
@@ -22,6 +22,7 @@
 #include "mission_manager/mission_parser.h"
 #include "mission_manager/ai_alias_translator.h"
 #include "player_manager/character.h"
+#include "player_manager/player_manager.h"
 #include "creature_manager/creature_manager.h"
 #include "mission_manager/mission_manager.h"
 #include "game_item_manager/player_inv_xchg.h"
@@ -49,43 +50,55 @@ class CMissionStepTalk : public IMissionStepTemplate
 	bool	buildStep( uint32 line, const std::vector< std::string > & script, CMissionGlobalParsingData & globalData, CMissionSpecificParsingData & missionData )
 	{
 		_SourceLine = line;
-		if ( script.size() < 3 )
+		if ( script.size() < 2 )
 		{
 			MISLOGSYNTAXERROR("<npc_name> [: <phrase_id>*[;<param>]]");
 			return false;
 		}
 		bool ret = true;
-		// parse bot
-		if ( !CMissionParser::parseBotName(script[1], _Bot, missionData) )
+		//// Dynamic Mission Args : #dynamic#
+		if (trim(script[1]) == "#dynamic#")
 		{
-			MISLOGERROR1("invalid npc '%s'", script[1].c_str());
-			return false;
-		}
-		// parse phrase and params
-		if (script.size() > 2)
-		{
-			// parse a specific phrase
-			if (!CMissionParser::parseParamText(line, script[2], _PhraseId, _Params ))
-			{
-				MISLOGERROR1("invalid text '%s'", script[2].c_str());
-				return false;
-			}
+			_Dynamic = missionData.Name;
+			_PhraseId = _Dynamic+"_ACTION";
+			_IsDynamic = true;
 		}
 		else
 		{
-			// use the default phrase
-			_PhraseId = "MIS_TALK_TO_MENU";
+			_IsDynamic = false;
+			// parse bot
+			if ( !CMissionParser::parseBotName(script[1], _Bot, missionData) )
+			{
+				MISLOGERROR1("invalid npc '%s'", script[1].c_str());
+				return false;
+			}
+
+			// parse phrase and params
+			if (script.size() > 2)
+			{
+				// parse a specific phrase
+				if (!CMissionParser::parseParamText(line, script[2], _PhraseId, _Params ))
+				{
+					MISLOGERROR1("invalid text '%s'", script[2].c_str());
+					return false;
+				}
+			}
+			else
+			{
+				// use the default phrase
+				_PhraseId = "MIS_TALK_TO_MENU";
+			}
+
+			// add a first default param (the name of the bot we talk to)
+			_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
+			_Params[0].Identifier = CMissionParser::getNoBlankString(script[1]);
 		}
-
-		// add a first default param (the name of the bot we talk to)
-		_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
-		_Params[0].Identifier = CMissionParser::getNoBlankString(script[1]);
-
 		return true;
 	}
 
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		_User = PlayerManager.getChar(getEntityIdFromRow(userRow));
 		// not check here : they are done befor. If a talk event comes here, the step is complete
 		if( event.Type == CMissionEvent::Talk )		
 		{
@@ -102,9 +115,50 @@ class CMissionStepTalk : public IMissionStepTemplate
 		ret[0] = 1;
 	}
 
+	bool getDynamicBot(TAIAlias & aliasRet)
+	{
+		if (_User != NULL)
+		{
+			vector<string> params = _User->getCustomMissionParams(_Dynamic);
+			if (params.size() < 2)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return false;
+			}
+			else
+			{
+				vector<TAIAlias> aliases;
+				CAIAliasTranslator::getInstance()->getNPCAliasesFromName(params[1], aliases);
+				if ( aliases.empty() )
+				{
+					MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+					return false;
+				}
+
+				aliasRet = aliases[0];
+				return true;
+			}
+		}
+		return false;
+	}
+
 	virtual uint32 sendContextText(const TDataSetRow& user, const TDataSetRow& interlocutor, CMission * instance, bool & gift, const NLMISC::CEntityId & giver )
 	{
+
+		if (_IsDynamic)
+		{
+			if (!getDynamicBot(_Bot) || _User == NULL)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return 0;
+			}
+
+			TVectorParamCheck params;
+			return STRING_MANAGER::sendStringToClient( user, _PhraseId, params );
+		}
+
 		CCreature * bot = CreatureManager.getCreature( interlocutor );
+
 		if ( bot )
 		{
 			if ( ( _Bot != CAIAliasTranslator::Invalid && _Bot == bot->getAlias() ) ||
@@ -124,6 +178,12 @@ class CMissionStepTalk : public IMissionStepTemplate
 	
 	virtual bool hasBotChatOption(const TDataSetRow & interlocutor, CMission * instance, bool & gift)
 	{
+		if (_IsDynamic && !getDynamicBot(_Bot))
+		{
+			MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+			return 0;	
+		}
+
 		CCreature * bot = CreatureManager.getCreature( interlocutor );
 		if ( bot )
 		{
@@ -140,6 +200,27 @@ class CMissionStepTalk : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		if (_IsDynamic && !getDynamicBot(_Bot))
+		{
+			MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+			static const std::string stepText = "DEBUG_CRASH_P_SMG_CRASH2";
+			textPtr = &stepText;
+			return;	
+		}
+
+		if (_IsDynamic &&  _User != NULL)
+		{
+
+			vector<string> params = _User->getCustomMissionParams(_Dynamic);
+			if (params.size() < 2)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return;
+			}
+			_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
+			_Params[0].Identifier = params[1];
+		}
+
 		nbSubSteps = 1;
 		static const std::string stepText = "MIS_TALK_TO";
 		textPtr = &stepText;
@@ -151,16 +232,23 @@ class CMissionStepTalk : public IMissionStepTemplate
 		else
 			retParams[0].Identifier = "giver";		
 	}
+
 	bool solveTextsParams( CMissionSpecificParsingData & missionData,CMissionTemplate * templ  )
 	{
-		bool ret = IMissionStepTemplate::solveTextsParams(missionData,templ);
-		if ( !CMissionParser::solveTextsParams(_SourceLine, _Params,missionData ) )
-			ret = false;
-		return ret;
+		if (!_IsDynamic)
+		{
+			bool ret = IMissionStepTemplate::solveTextsParams(missionData,templ);
+			if ( !CMissionParser::solveTextsParams(_SourceLine, _Params,missionData ) )
+				ret = false;
+			return ret;
+		}
+		return true;
 	}
 
 	virtual TAIAlias getInvolvedBot(bool& invalidIsGiver) const { invalidIsGiver=true; return _Bot; }
 
+	bool _IsDynamic;
+	std::string	_Dynamic;
 	std::string _PhraseId;
 	TVectorParamCheck _Params;
 	TAIAlias	_Bot;
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
index d18525bb6..4df10e243 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
@@ -102,6 +102,8 @@ uint32 IMissionStepTemplate::sendRpStepText(CCharacter * user,const std::vector<
 	uint nbSteps = 0;
 	const std::string* textPtr = NULL;
 
+	_User = user;
+
 	if ( !_RoleplayText.empty() )
 	{
 		// build the param list
@@ -143,6 +145,8 @@ uint32 IMissionStepTemplate::sendStepText(CCharacter * user,const std::vector<ui
 	uint nbSteps = 0;
 	const std::string* textPtr = NULL;
 
+	_User = user;
+
 	// build the param list
 	getTextParams(nbSteps,(const std::string *&)textPtr,params,stepStates);
 	
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
index 4adaddb97..132463bec 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
@@ -41,7 +41,7 @@ public:
 	//@{
 	/// ctor
 	inline IMissionStepTemplate()
-		:_OOOStepIndex(0xFFFFFFFF),_Any(false),_Displayed(true),_IconDisplayedOnStepNPC(true),_IsInOverridenOOO(false) {}	
+		:_OOOStepIndex(0xFFFFFFFF),_Any(false),_Displayed(true),_IconDisplayedOnStepNPC(true),_IsInOverridenOOO(false),_User(NULL) {}	
 
 	//BRIANCODE my appologies, need access to this data from CMissionStepGiveItem	
 	struct CSubStep
@@ -164,7 +164,8 @@ protected:
 	bool								_AddDefaultParams;
 	/// flag set to true if the step is in an OOO block which text wad overriden
 	bool								_IsInOverridenOOO;
-
+	/// Player running the mission
+	CCharacter * 						_User;
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
index af0686f1e..fec609384 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
@@ -1357,7 +1357,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				returnValue = MISSION_DESC::PreReqFail;
 				logOnFail = false;*/
 			}
-
 		}
 		// check non replayable missions
 		if( !Tags.Replayable )
@@ -1387,7 +1386,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				logOnFail = false;*/
 			}
 		}
-		
 	}
 	else
 	{
@@ -1474,7 +1472,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 					}
 					if (guild->isMissionSuccessfull(templ->Alias))
 						break;
-						
 				}
 				else if ( templ->Type == MISSION_DESC::Solo )
 				{
@@ -1534,7 +1531,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 						break;
 					/*if (!guild || !guild->isMissionSuccessfull(templ->Alias))
 						break;*/
-						
 				}
 				else if ( templ->Type == MISSION_DESC::Solo )
 				{
@@ -1590,7 +1586,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 			{
 
 				/// todo guild mission
-				
 				CGuild* guild = CGuildManager::getInstance()->getGuildFromId( user->getGuildId() );
 				if ( !guild )
 				{
@@ -1606,7 +1601,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				}
 				if (k != guild->getMissions().size())
 					break;
-
 			}
 			else if ( templ->Type == MISSION_DESC::Solo )
 			{
@@ -1702,9 +1696,7 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 
 			if ( templ->Type == MISSION_DESC::Guild )
 			{
-
 				/// todo guild mission
-				
 				CGuild* guild = CGuildManager::getInstance()->getGuildFromId( user->getGuildId() );
 				if(!guild)
 					break;
@@ -1717,7 +1709,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				}
 				if (k == guild->getMissions().size())
 					break;
-
 			}
 			else if ( templ->Type == MISSION_DESC::Solo )
 			{
diff --git a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
index d64c097ea..e347597d2 100644
--- a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
+++ b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
@@ -1096,10 +1096,22 @@ public:
 					// this is a special user, store it in the appropriate container
 					_OnlineSpecialEntities[cci.getPrivilege()].insert(charEid);
 				}
+
+				// Update LastPlayedDate
+				ICharacter *character = ICharacter::getInterface(IPlayerManager::getInstance().getActiveChar(uint32(charEid.getShortId()>>4)), true);
+				if (character)
+					character->setLastConnectionDate(cci.getlastConnectionDate());
+
 			}
 			else
 			{
 				nldebug("  Char %s has disconnected", charEid.toString().c_str());
+
+				// Update LastPlayedDate
+				ICharacter *character = ICharacter::getInterface(IPlayerManager::getInstance().getActiveChar(uint32(charEid.getShortId()>>4)), true);
+				if (character)
+					character->setLastConnectionDate(0);
+
 				// this character disconnected
 				_OnlineEntities.erase(charEid);
 
diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
index 07b098793..2f72d37c4 100644
--- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
+++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
@@ -84,7 +84,7 @@ CVariable<bool> UseProxyMoneyForOutpostCosts("egs", "UseProxyMoneyForOutpostCost
 CVariable<uint32> OutpostStateTimeOverride("egs", "OutpostStateTimeOverride", "Each state can be set to a shorter time in seconds, 0 means default computed value", true, 0, true );
 CVariable<uint32> OutpostJoinPvpTimer("egs", "OutpostJoinPvpTimer", "Max time the player has to answer the JoinPvp Window, in seconds", 10, 0, true );
 CVariable<uint32> NumberDayFactorGuildNeedForChallengeOutpost("egs","NumberDayFactorGuildNeedForChallengeOutpost","Nombre de 'level outpost / factor' jours d'existance que la guilde doit avoir pour pouvoir challenger un outpost",10,0,true);
-CVariable<sint32> NumberDaysMinusOutpostLevelForChallenge("egs","NumberDaysMinusOutpostLevelForChallenge", "Nombre à enlever au level du oupost pour avoir l'ancieneté requise pour challenger un outpost",50,0,true);
+CVariable<sint32> NumberDaysMinusOutpostLevelForChallenge("egs","NumberDaysMinusOutpostLevelForChallenge", "Number to substract from outpost level to get oldness required to challenge an outpost",50,0,true);
 
 extern CPlayerManager PlayerManager;
 
@@ -1463,50 +1463,55 @@ PVP_RELATION::TPVPRelation COutpost::getPVPRelation( CCharacter * user, CEntityB
 	if( IsRingShard )
 		return PVP_RELATION::Neutral;
 
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
 	if( target->getOutpostAlias() == 0 )
 	{
 		return PVP_RELATION::Neutral;
 	}
-	else
-	{
-		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
-		if(pTarget)
-		{
-			if( CPVPManager2::getInstance()->inSafeZone( pTarget->getPosition() ) )
-			{
-				if( pTarget->getSafeInPvPSafeZone() )
-				{
-					return PVP_RELATION::NeutralPVP;
-				}
-			}
-		}
-		if( CPVPManager2::getInstance()->inSafeZone( user->getPosition() ) )
-		{
-			if( user->getSafeInPvPSafeZone() )
-			{
-				return PVP_RELATION::NeutralPVP;
-			}
-		}
+	
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+	if (pTarget == 0)
+		return PVP_RELATION::Unknown;
 
-		if( user->getOutpostAlias() != target->getOutpostAlias() )
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
+	{
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
+	}
+
+	if( CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	// One is safe but not other => NeutralPVP
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	if( user->getOutpostAlias() == target->getOutpostAlias() )
+	{
+		if( user->getOutpostSide() != target->getOutpostSide() )
 		{
-			return PVP_RELATION::NeutralPVP;		
-		}
-		else
-		{
-			if( user->getOutpostSide() != target->getOutpostSide() )
+			if (!targetSafe && !actorSafe)
 			{
 				CPVPManager2::getInstance()->setPVPOutpostEnemyReminder( true );
 				return PVP_RELATION::Ennemy;
 			}
-			else
-			{
-				CPVPManager2::getInstance()->setPVPOutpostAllyReminder( true );
-				return PVP_RELATION::Ally;
-			}
+		}
+		else
+		{
+			CPVPManager2::getInstance()->setPVPOutpostAllyReminder( true );
+			return PVP_RELATION::Ally;
 		}
 	}
 
+	return PVP_RELATION::NeutralPVP;
+
 } // getPVPRelation //
 
 //----------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
index 7e32b3060..4c8af6b6c 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
@@ -1528,21 +1528,21 @@ bool testOffensiveActionAllowed( const NLMISC::CEntityId &actorId, const NLMISC:
 		return false;
 	}
 
-	// test target isn't invulnerable
-	if (target->getContextualProperty().directAccessForStructMembers().invulnerable())
-	{
-		// check target Faction attackable flags
-		CCreature *creature = dynamic_cast<CCreature *> (target);
-		if (!creature || !creature->checkFactionAttackable(actorId))
-		{
-			errorCode = "BS_TARGET_NOT_ATTACKABLE";
-			return false;
-		}
-	}
-
 	// AI 
 	if (actorId.getType() != RYZOMID::player)
 	{
+		// test target isn't invulnerable
+		if (target->getContextualProperty().directAccessForStructMembers().invulnerable())
+		{
+			// check target Faction attackable flags
+			CCreature *creature = dynamic_cast<CCreature *> (target);
+			if (!creature || !creature->checkFactionAttackable(actorId))
+			{
+				errorCode = "BS_TARGET_NOT_ATTACKABLE";
+				return false;
+			}
+		}
+
 		if (mainTarget == true)
 			return true;
 		else
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index 70c8238ac..383d835a7 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -210,7 +210,7 @@ CVariable<uint32>			SpawnedDeadMektoubDelay("egs","SpawnedDeadMektoubDelay", "nb
 CVariable<bool>				ForceQuarteringRight("egs","ForceQuarteringRight", "Allow anyone to quarter a dead creature", false, 0, true );
 CVariable<bool>				AllowAnimalInventoryAccessFromAnyStable("egs", "AllowAnimalInventoryAccessFromAnyStable", "If true a player can access to his animal inventory (if the animal is inside a stable) from any stable over the world", true, 0, true );
 CVariable<uint32>			FreeTrialSkillLimit("egs", "FreeTrialSkillLimit", "Level limit for characters belonging to free trial accounts", 125,0,true);
-CVariable<uint32>			CraftFailureProbaMpLost("egs", "CraftFailureProbaMpLost", "Probabilité de destruction de chaque MP en cas d'echec du craft", 50,0,true);
+CVariable<uint32>			CraftFailureProbaMpLost("egs", "CraftFailureProbaMpLost", "Probability de destruction de chaque MP en cas d'echec du craft", 50,0,true);
 
 
 // Number of login stats kept for a character
@@ -411,6 +411,8 @@ CCharacter::CCharacter():	CEntityBase(false),
 
 	// pvp for player with privilege inactive
 	_PriviledgePvp = false;
+	// full pvp
+	_FullPvp = false;
 	// aggroable undefined
 	_Aggroable = true;
 	_AggroableOverride = -1;
@@ -421,12 +423,17 @@ CCharacter::CCharacter():	CEntityBase(false),
 	for (uint i = 0 ; i < (PVP_CLAN::EndClans-PVP_CLAN::BeginClans+1); ++i)
 		_FactionPoint[i] = 0;
 
+	_PvpPoint = 0;
 	_PVPFlagLastTimeChange = 0;
 	_PVPFlagTimeSettedOn = 0;
 	_PvPDatabaseCounter = 0;
 	_PVPFlag = false;
 	_PVPRecentActionTime = 0;
 
+	_Organization = 0;
+	_OrganizationStatus = 0;
+	_OrganizationPoints = 0;
+
 	// do not start berserk
 	_IsBerserk = false;
 
@@ -493,6 +500,9 @@ CCharacter::CCharacter():	CEntityBase(false),
 	///init teamId
 	_TeamId= CTEAM::InvalidTeamId;
 
+	///init LeagueId
+	_LeagueId = TChanID::Unknown;
+
 	// init combat flags
 	_CombatEventFlagTicks.resize(32);
 	for( uint i=0; i<32; ++i )
@@ -641,6 +651,10 @@ CCharacter::CCharacter():	CEntityBase(false),
 	_CurrentSessionId = _SessionId;
 	_PvPSafeZoneActive = false;
 
+	_PVPSafeLastTimeChange = CTickEventHandler::getGameCycle();
+	_PVPSafeLastTime = false;
+	_PVPInSafeZoneLastTime = false;
+
 	// For client/server contact list communication
 	_ContactIdPool= 0;
 
@@ -653,6 +667,10 @@ CCharacter::CCharacter():	CEntityBase(false),
 
 	_LastTickNpcControlUpdated = CTickEventHandler::getGameCycle();
 
+	_LastWebCommandIndex = 0;
+
+	_CustomMissionsParams.clear();
+
 	initDatabase();
 } // CCharacter  //
 
@@ -773,55 +791,20 @@ void	CCharacter::initPDStructs()
 void CCharacter::updatePVPClanVP() const
 {
 	TYPE_PVP_CLAN propPvpClanTemp = 0;
-	uint32 maxFameCiv = 0;
-	uint8 civOfMaxFame = 255;
-	uint32 maxFameCult = 0;
-	uint8 cultOfMaxFame = 255;
+	
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+		propPvpClanTemp = 1+(uint32)(_LeagueId.getShortId());
+	else
+		propPvpClanTemp = 0;
 
-	for (uint8 fameIdx = 0; fameIdx < 7; fameIdx++)
-	{
-		sint32 fame = CFameInterface::getInstance().getFameIndexed(_Id, fameIdx);
-		if (fameIdx < 4)
-		{
-			if ((uint32)abs(fame) >= maxFameCiv)
-			{
-				civOfMaxFame = fameIdx;
-				maxFameCiv = abs(fame);
-			}
-		}
-		else
-		{ 
-			if ((uint32)abs(fame) >= maxFameCult)
-			{
-				cultOfMaxFame = fameIdx - 4;
-				maxFameCult = abs(fame);
-			}
-		}
-
-		if (fame >= PVPFameRequired*6000)
-		{
-			propPvpClanTemp |= (TYPE_PVP_CLAN(1) << (2*TYPE_PVP_CLAN(fameIdx)));
-		}
-		else if (fame <= -PVPFameRequired*6000)
-		{
-			propPvpClanTemp |= (TYPE_PVP_CLAN(1) << ((2*TYPE_PVP_CLAN(fameIdx))+1));
-		}
-		if (getPvPRecentActionFlag())
-		{
-			uint8 flagAlly = (_PVPFlagAlly & (1 << TYPE_PVP_CLAN(fameIdx))) >> TYPE_PVP_CLAN(fameIdx);
-			uint8 flagEnemy = (_PVPFlagEnemy & (1 << TYPE_PVP_CLAN(fameIdx))) >> TYPE_PVP_CLAN(fameIdx);
-			propPvpClanTemp |= flagAlly << (2*TYPE_PVP_CLAN(fameIdx));
-			propPvpClanTemp |= flagEnemy << ((2*TYPE_PVP_CLAN(fameIdx))+1);
-		}
-
-	}
-	propPvpClanTemp |= TYPE_PVP_CLAN(civOfMaxFame) << (2*TYPE_PVP_CLAN(7));
-	propPvpClanTemp |= TYPE_PVP_CLAN(cultOfMaxFame) << (2*TYPE_PVP_CLAN(8));
 	CMirrorPropValue<TYPE_PVP_CLAN> propPvpClan( TheDataset, TheDataset.getDataSetRow(_Id), DSPropertyPVP_CLAN );
-
-	propPvpClan = (uint32)propPvpClanTemp;
+	if (propPvpClan.getValue() != propPvpClanTemp)
+	{
+		propPvpClan = propPvpClanTemp;
+		propPvpClan.setChanged();
+	}
 }
-
+/*
 TYPE_PVP_CLAN CCharacter::getPVPFamesAllies()
 {
 	TYPE_PVP_CLAN propPvpClanTemp = 0;
@@ -843,7 +826,7 @@ TYPE_PVP_CLAN CCharacter::getPVPFamesEnemies()
 		return propPvpClanTemp | _PVPFlagEnemy;
 	return propPvpClanTemp;
 }
-
+*/
 
 //-----------------------------------------------
 // addPropertiesToMirror :
@@ -1464,6 +1447,29 @@ uint32 CCharacter::tickUpdate()
 	{
 		H_AUTO(CharacterUpdatePVPMode);
 
+		if (_PVPSafeLastTimeChange + 20 < CTickEventHandler::getGameCycle())
+		{
+			bool update = false;
+			_PVPSafeLastTimeChange = CTickEventHandler::getGameCycle();
+
+			if (_PVPSafeLastTime != getSafeInPvPSafeZone())
+			{
+				_PVPSafeLastTime = !_PVPSafeLastTime;
+				update = true;
+			}
+
+			if (_PVPInSafeZoneLastTime != CPVPManager2::getInstance()->inSafeZone(getPosition()))
+			{
+				_PVPInSafeZoneLastTime = !_PVPInSafeZoneLastTime;
+				update = true;
+			}
+			
+			if (update) {
+				CPVPManager2::getInstance()->setPVPModeInMirror(this);
+				updatePVPClanVP();
+			}
+		}
+
 		if( _HaveToUpdatePVPMode )
 		{
 			const TGameCycle waitTime = _PVPFlag ? TimeForSetPVPFlag.get() : TimeForPVPFlagOff.get();
@@ -2865,7 +2871,9 @@ void CCharacter::postLoadTreatment()
 			{
 				_PlayerPets[ i ].Slot = INVENTORIES::INVALID_INVENTORY_SLOT;
 			}
-			uint32 slot = _PlayerPets[ i ].initLinkAnimalToTicket( this );
+
+			sendPetCustomNameToClient(i);
+			uint32 slot = _PlayerPets[ i ].initLinkAnimalToTicket( this, i );
 			if( slot < INVENTORIES::NbPackerSlots )
 			{
 				tickets[ slot ] =  true;
@@ -3625,7 +3633,7 @@ void CCharacter::setTargetBotchatProgramm( CEntityBase * target, const CEntityId
 //				_PropertyDatabase.setProp( toString("TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%u:PLAYER_GIFT_NEEDED",i) , 0 );
 				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPLAYER_GIFT_NEEDED(_PropertyDatabase, 0 );
 //				_PropertyDatabase.setProp( toString("TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%u:PRIORITY",i), 0  );
-				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPRIORITY(_PropertyDatabase, 0 );
+				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPRIORITY(_PropertyDatabase, 2 );
 				i++;
 			}
 		}
@@ -4563,13 +4571,31 @@ bool CCharacter::fillFaberMaterialArray( vector<CFaberMsgItem>& materialsSelecte
 	lowerMaterialQuality = USHRT_MAX;
 	for( uint s = 0; s < materialsSelectedForFaber.size(); ++s )
 	{
+		bool bOk = false;
+		CInventoryPtr pInv = NULL;
 		if( materialsSelectedForFaber[ s ].getInvId() >= INVENTORIES::NUM_INVENTORY )
 		{
-			nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid inventory index %d", s, materialsSelectedForFaber[ s ].getInvId() );
-			return false;
+			// Also allow crafting from player's room
+			if (materialsSelectedForFaber[ s ].getInvId() == INVENTORIES::player_room)
+			{
+				if (getRoomInterface().isValid() && getRoomInterface().canUseInventory(this, this))
+				{
+					pInv = getRoomInterface().getInventory();
+					bOk = true;
+				}
+			}
+
+			if ( ! bOk) 
+			{
+				nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid inventory index %d", s, materialsSelectedForFaber[ s ].getInvId() );
+				return false;
+			}
+		}
+		else
+		{
+			pInv = _Inventory[ materialsSelectedForFaber[ s ].getInvId() ];
 		}
 
-		CInventoryPtr pInv = _Inventory[ materialsSelectedForFaber[ s ].getInvId() ];
 		if( materialsSelectedForFaber[ s ].IndexInInv >= pInv->getSlotCount() )
 		{
 			nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid index %d for inventory %d", s, materialsSelectedForFaber[ s ].IndexInInv, materialsSelectedForFaber[ s ].getInvId() );
@@ -5170,6 +5196,9 @@ bool CCharacter::addCharacterAnimal( const CSheetId& PetTicket, uint32 Price, CG
 		{
 			_PlayerPets[ i ] = pet;
 
+			pet.ItemPtr->setPetIndex(i);
+			pet.Slot = ptr->getInventorySlot();
+
 			// init pet inventory
 			const uint32 petMaxWeight = 0xFFFFFFFF; // no weight limit
 			const uint32 petMaxBulk = _PlayerPets[ i ].getAnimalMaxBulk();
@@ -5433,6 +5462,7 @@ bool CCharacter::spawnWaitingCharacterAnimalNear( uint index, const SGameCoordin
 	msg.CharacterMirrorRow = _EntityRowId;
 	msg.PetSheetId = _PlayerPets[ index ].PetSheetId;
 	msg.PetIdx = index;
+	msg.CustomName = _PlayerPets[ index ].CustomName;
 	msg.AIInstanceId = (uint16)destAIInstance;
 	CWorldInstances::instance().msgToAIInstance( msg.AIInstanceId, msg);
 	// The row will be received in AnimalSpawned()
@@ -5544,6 +5574,7 @@ bool CCharacter::spawnCharacterAnimal(uint index )
 			msg.CharacterMirrorRow = _EntityRowId;
 			msg.PetSheetId = _PlayerPets[ index ].PetSheetId;
 			msg.PetIdx = index;
+			msg.CustomName = _PlayerPets[ index ].CustomName;
 
 			CVector pos;
 			pos.x = msg.Coordinate_X * 0.001f;
@@ -6723,6 +6754,38 @@ void CCharacter::sendAnimalCommand( uint8 petIndexCode, uint8 command )
 	}
 }
 
+void CCharacter::setAnimalName( uint8 petIndex, ucstring customName )
+{
+	if (petIndex < 0 || petIndex >= MAX_INVENTORY_ANIMAL)
+	{
+		nlwarning("<CCharacter::setAnimalName> Incorect animal index '%d'.", petIndex);
+		return;
+	}
+	CPetAnimal& animal = _PlayerPets[petIndex];
+
+	animal.setCustomName(customName);
+	sendPetCustomNameToClient(petIndex);
+	
+	TDataSetRow row = animal.SpawnedPets;
+	NLNET::CMessage	msgout("CHARACTER_NAME");
+	msgout.serial(row);
+	msgout.serial(customName);
+	sendMessageViaMirror("IOS", msgout);
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::sendPetCustomNameToClient(uint8 petIndex)
+{
+	uint32 textId = 0;
+	if (_PlayerPets[petIndex].CustomName.length() > 0)
+	{
+		SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+		params[0].Literal= _PlayerPets[petIndex].CustomName;
+		uint32 userId = PlayerManager.getPlayerId(_Id);
+		textId = STRING_MANAGER::sendStringToUser(userId, "LITERAL", params);
+	}
+	CBankAccessor_PLR::getPACK_ANIMAL().getBEAST(petIndex).setNAME(_PropertyDatabase, textId);
+}
 
 
 //-----------------------------------------------
@@ -6842,6 +6905,7 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 	}
 
 	// check whether this character is on a free trial account
+	bool bFreeTrialLimitReached = false;
 	CPlayer * p = PlayerManager.getPlayer(PlayerManager.getPlayerId( getId() ));
 	BOMB_IF(p == NULL,"Failed to find player record for character: "<<getId().toString(),return 0.0);
 	if (p->isTrialPlayer())
@@ -6853,7 +6917,7 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 			SM_STATIC_PARAMS_1(params, STRING_MANAGER::skill);
 			params[0].Enum = skillEnum;
 			PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "PROGRESS_FREE_TRIAL_LIMIT", params);
-			return 0.0;
+			bFreeTrialLimitReached = true;
 		}
 	}
 
@@ -6893,6 +6957,11 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 	// update death penalty
 	_DeathPenalties->addXP( *this, skillEnum, XpGain);
 
+	if (bFreeTrialLimitReached)
+	{
+		return 0.0;
+	}
+
 	// if no remaining XPGain, return
 	if (XpGain == 0.0f)
 		return 0.0;
@@ -8800,7 +8869,7 @@ void CCharacter::setDatabase()
 	_IneffectiveAuras.activate();
 	_ConsumableOverdoseEndDates.activate();
 	// init the RRPs
-	RingRewardPoints.initDb();
+	//RingRewarsdPoints.initDb();
 
 }// setDatabase //
 
@@ -8862,7 +8931,7 @@ void CCharacter::startTradeItemSession( uint16 session )
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 		fame = MinFameToTrade;
 	}
-	else if ( fame < MinFameToTrade )
+	else if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -8961,14 +9030,13 @@ void CCharacter::startTradePhrases(uint16 session)
 		return;
 	}
 
-
 	// *** Check the player has sufficient fame to Trade with Bot.
 	sint32 fame = CFameInterface::getInstance().getFameIndexed( _Id, bot->getForm()->getFaction() );
 	if ( fame == NO_FAME )
 	{
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 	}
-	if ( fame < MinFameToTrade )
+	if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -9738,7 +9806,7 @@ void CCharacter::sellItem( INVENTORIES::TInventory inv, uint32 slot, uint32 quan
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 		fame = MinFameToTrade;
 	}
-	else if ( fame < MinFameToTrade )
+	else if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -10087,6 +10155,84 @@ void CCharacter::initFactionPointDb()
 	}
 }
 
+
+//-----------------------------------------------
+// setPvpPoint : set the number of pvp point
+//
+//-----------------------------------------------
+void CCharacter::setPvpPoint(uint32 nbPt)
+{
+	_PvpPoint = nbPt;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(0).setVALUE(_PropertyDatabase, nbPt );
+
+}
+
+//-----------------------------------------------
+// getPvpPoint : get the number of pvp point
+//
+//-----------------------------------------------
+uint32 CCharacter::getPvpPoint()
+{
+	return _PvpPoint;
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::initPvpPointDb()
+{
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(0).setVALUE(_PropertyDatabase, _PvpPoint );
+}
+
+
+//-----------------------------------------------------------------------------
+void CCharacter::setOrganization(uint32 org)
+{
+	if (org == _Organization)
+		return;
+	_Organization = org;
+	_OrganizationStatus = 0;
+	_OrganizationPoints = 0;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(1).setVALUE(_PropertyDatabase, _Organization );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::setOrganizationStatus(uint32 status)
+{
+	_OrganizationStatus = status;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::changeOrganizationStatus(sint32 status)
+{
+	if (status < 0 && abs(status) > _OrganizationStatus)
+		_OrganizationStatus = 0;
+	else
+		_OrganizationStatus += status;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::changeOrganizationPoints(sint32 points)
+{
+	if (points < 0 && abs(points) > _OrganizationPoints)
+		_OrganizationPoints = 0;
+	else
+		_OrganizationPoints += points;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+
+//-----------------------------------------------------------------------------
+void CCharacter::initOrganizationInfos()
+{
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(1).setVALUE(_PropertyDatabase, _Organization );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+
 //-----------------------------------------------------------------------------
 void CCharacter::sendFactionPointGainMessage(PVP_CLAN::TPVPClan clan, uint32 fpGain)
 {
@@ -10176,6 +10322,16 @@ void CCharacter::exchangeProposal()
 			return;
 		}
 
+		// If not a privileged player and in ignorelist, don't trade
+		if ( !haveAnyPrivilege() && c->hasInIgnoreList( getId() ) )
+		{
+			params.resize(1);
+			params[0].Type = STRING_MANAGER::player;
+			params[0].setEIdAIAlias( c->getId(), CAIAliasTranslator::getInstance()->getAIAlias(c->getId()) );
+			CCharacter::sendDynamicSystemMessage(_EntityRowId, "EXCHANGE_DECLINE", params);
+			return;
+		}
+
 		//set the target's exchange asker, and inform the target
 		c->_ExchangeAsker = _Id;
 
@@ -11267,7 +11423,7 @@ void CCharacter::setBerserkFlag(bool isBerserk)
 				}
 				else
 				{
-					sint8 percentTmp = sint8( (100.0 * ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
+					sint8 percentTmp = sint8( (127.0 * ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
 					if( percentTmp < 0 )
 						percent = 0;
 					else
@@ -11666,7 +11822,7 @@ bool CCharacter::processMissionEventList( std::list< CMissionEvent* > & eventLis
 
 			// If the mission is not for guild members we just instanciate it
 			if (!missionForGuild)
-				CMissionManager::getInstance()->instanciateMission(this, mission, giver ,eventList, mainMission);
+				CMissionManager::getInstance()->instanciateMission(this, mission, giver, eventList, mainMission);
 			else
 			{
 				// We find the guild and each guild members and we instanciate the mission for them
@@ -11681,7 +11837,7 @@ bool CCharacter::processMissionEventList( std::list< CMissionEvent* > & eventLis
 							nlwarning( "<MISSIONS>cant find user %s", it->first.toString().c_str() );
 							continue;
 						}
-						CMissionManager::getInstance()->instanciateMission(guildUser, mission, giver ,eventList, mainMission);
+						CMissionManager::getInstance()->instanciateMission(guildUser, mission, giver, eventList, mainMission);
 					}
 				}
 			}
@@ -13430,7 +13586,45 @@ void CCharacter::sendUrl(const string &url, const string &salt)
 	PlayerManager.sendImpulseToClient(getId(), "USER:POPUP", titleId, textId);
 }
 
+void CCharacter::validateDynamicMissionStep(const string &url)
+{
+	sendUrl(url+"&player_eid="+getId().toString()+"&event=mission_step_finished", getSalt());
+}
 
+/// set custom mission param
+void CCharacter::setCustomMissionParams(const string &missionName, const string &params)
+{
+	_CustomMissionsParams[missionName] = params;
+}
+
+/// add custom mission param
+void CCharacter::addCustomMissionParam(const string &missionName, const string &param)
+{
+	if (!_CustomMissionsParams.empty() && _CustomMissionsParams.find(missionName) != _CustomMissionsParams.end())
+		_CustomMissionsParams[missionName] += ","+param;
+	else
+		_CustomMissionsParams[missionName] = param;
+}
+
+/// get custom mission params 
+vector<string> CCharacter::getCustomMissionParams(const string &missionName)
+{
+	vector<string> params;
+	if (_CustomMissionsParams.empty()) 
+	{
+		return params;
+	}
+	
+	if (!_CustomMissionsParams.empty() && _CustomMissionsParams.find(missionName) != _CustomMissionsParams.end())
+	{
+		if (!_CustomMissionsParams[missionName].empty())
+			NLMISC::splitString(_CustomMissionsParams[missionName], ",", params);
+	}
+	return params;
+}
+
+
+// !!! Deprecated !!!
 void CCharacter::addWebCommandCheck(const string &url, const string &data, const string &salt)
 {
 	uint webCommand = getWebCommandCheck(url);
@@ -13494,6 +13688,7 @@ void CCharacter::addWebCommandCheck(const string &url, const string &data, const
 	}
 }
 
+// !!! Deprecated !!!
 uint CCharacter::getWebCommandCheck(const string &url)
 {
 	CInventoryPtr inv = getInventory(INVENTORIES::bag);
@@ -13528,6 +13723,7 @@ uint CCharacter::getWebCommandCheck(const string &url)
 	return INVENTORIES::NbBagSlots;
 }
 
+// !!! Deprecated !!!
 uint CCharacter::checkWebCommand(const string &url, const string &data, const string &hmac, const string &salt)
 {
 	if (salt.empty())
@@ -14651,14 +14847,10 @@ void CCharacter::addRoomAccessToPlayer(const NLMISC::CEntityId &id)
 void CCharacter::addPlayerToFriendList(const NLMISC::CEntityId &id)
 {
 	// if player not found
-	if (id == CEntityId::Unknown || PlayerManager.getChar(id)==NULL)
+	if (id == CEntityId::Unknown)
 	{
-		if ( ! (IShardUnifierEvent::getInstance() && IShardUnifierEvent::getInstance()->isCharacterOnlineAbroad(id)))
-		{
-			// player not found => message
-			PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
-			return;
-		}
+		PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
+		return;
 	}
 
 	// check not already in list
@@ -14721,6 +14913,78 @@ void CCharacter::addPlayerToFriendList(const NLMISC::CEntityId &id)
 }
 
 
+//--------------------------------------------------------------
+//	CCharacter::addPlayerToLeagueList() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::addPlayerToLeagueList(const NLMISC::CEntityId &id)
+{
+	// if player not found
+	if (id == CEntityId::Unknown)
+	{
+		PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
+		return;
+	}
+
+	// check not already in list
+	const uint size = _LeagueList.size();
+	for ( uint i =0 ; i < size ; ++i)
+	{
+		if ( _LeagueList[i].EntityId.getShortId() == id.getShortId())
+		{
+			return;
+		}
+	}
+
+	if(haveAnyPrivilege() == false && PlayerManager.haveAnyPriv(id))
+		return; // a character without privilege can't add one with privilege.
+
+	uint32 playerId = PlayerManager.getPlayerId(id);
+
+	// check the two char aren't from the same account
+	if (playerId == PlayerManager.getPlayerId(_Id))
+	{
+		egs_chinfo("Char %s tried to add %s in his friend list but they are from the same account->return", _Id.toString().c_str(), id.toString().c_str());
+		return;
+	}
+
+	// reference count
+	contactListRefChange( id, AddedAsLeague);
+
+	// add the char to friends
+	CContactId	contactId;
+	contactId.EntityId= id;
+	contactId.ContactId= _ContactIdPool++;	// create a new Id for client/server communication
+	_LeagueList.push_back(contactId);
+
+
+	// send create message to client
+	CMessage msgout( "IMPULSION_ID" );
+	msgout.serial( _Id );
+	CBitMemStream bms;
+
+	if ( ! GenericMsgManager.pushNameToStream( "TEAM:CONTACT_CREATE", bms) )
+	{
+		nlwarning("<CEntityBase::addPlayerToLeagueList> Msg name TEAM:CONTACT_CREATE not found");
+		return;
+	}
+	
+	TCharConnectionState onlineStatus = ccs_online;
+
+	uint32	nameId = CEntityIdTranslator::getInstance()->getEntityNameStringId(id);
+	uint8	listIndex = 2;
+
+	bms.serial(contactId.ContactId);
+	bms.serial(nameId);
+	bms.serialShortEnum(onlineStatus);
+	bms.serial(listIndex);
+
+	msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
+	CUnifiedNetwork::getInstance()->send( NLNET::TServiceId(_Id.getDynamicId()), msgout );
+
+}
+
+
+
 //--------------------------------------------------------------
 //	CCharacter::addPlayerToIgnoreList()
 //--------------------------------------------------------------
@@ -14822,6 +15086,23 @@ void CCharacter::removePlayerFromFriendListByIndex(uint16 index)
 	contactListRefChange( id, RemovedFromFriends);
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromFriendListByIndex() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByIndex(uint16 index)
+{
+	if (index >= _LeagueList.size())
+		return;
+
+	const	CEntityId id = _LeagueList[index].EntityId;
+	uint32	contactId= _LeagueList[index].ContactId;
+
+	// remove entry
+	_LeagueList.erase(_LeagueList.begin() + index);
+	sendRemoveContactMessage(contactId, 2);
+	contactListRefChange( id, RemovedFromLeague);
+}
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByIndex()
 //--------------------------------------------------------------
@@ -14901,6 +15182,25 @@ void CCharacter::removePlayerFromFriendListByEntityId(const NLMISC::CEntityId &i
 	}
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromLeagueListByEntityId() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByEntityId(const NLMISC::CEntityId &id)
+{
+	if (id == NLMISC::CEntityId::Unknown)
+		return;
+
+	for ( uint i = 0 ; i < _LeagueList.size() ; ++i)
+	{
+		if ( _LeagueList[i].EntityId.getShortId() == id.getShortId() )
+		{
+			removePlayerFromLeagueListByIndex(i);
+			break;
+		}
+	}
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByEntityId()
 //--------------------------------------------------------------
@@ -14934,6 +15234,22 @@ void CCharacter::removePlayerFromFriendListByContactId(uint32 contactId)
 	}
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromFriendListByContactId() unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByContactId(uint32 contactId)
+{
+	for ( uint i = 0 ; i < _LeagueList.size() ; ++i)
+	{
+		if ( _LeagueList[i].ContactId == contactId )
+		{
+			removePlayerFromLeagueListByIndex(i);
+			break;
+		}
+	}
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByContactId()
 //--------------------------------------------------------------
@@ -15329,6 +15645,15 @@ void CCharacter::sendRemoveContactMessage(uint32 contactId, uint8 listNumber)
 	CUnifiedNetwork::getInstance()->send( NLNET::TServiceId(_Id.getDynamicId()), msgout );
 } // sendRemoveContactMessage //
 
+//--------------------------------------------------------------
+//	CCharacter::setLastConnectionDate()
+//--------------------------------------------------------------
+void CCharacter::setLastConnectionDate(uint32 date)
+{
+	_LastConnectedDate = date;	
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::destroyCharacter()
 //--------------------------------------------------------------
@@ -15476,8 +15801,6 @@ void CCharacter::onConnection()
 {
 	// Add all handledAIGroups for all missions of the player
 	spawnAllHandledAIGroup();
-	// add character to event channel if event occurs
-	CGameEventManager::getInstance().addCharacterToChannelEvent( this );
 
 	// update for the unified entity locator
 	if (IShardUnifierEvent::getInstance() != NULL)
@@ -15874,6 +16197,7 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
 			uint32 txtId = STRING_MANAGER::sendStringToClient( targetRow, phraseCont->TargetTarget, params );
 			// send emote message to IOS
 			NLNET::CMessage	msgout("EMOTE_PLAYER");
+			msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) );
 			msgout.serial( targetRow );
 			msgout.serial(txtId);
 			sendMessageViaMirror("IOS", msgout);
@@ -15884,7 +16208,8 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
 	uint32 txtId = STRING_MANAGER::sendStringToClient(getEntityRowId(), *self, params );
 	// send emote message to IOS
 	NLNET::CMessage	msgout("EMOTE_PLAYER");
-	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) );
+	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) ); // sender
+	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) ); // receiver
 	msgout.serial(txtId);
 	sendMessageViaMirror("IOS", msgout);
 
@@ -16226,7 +16551,14 @@ NLMISC::TGameCycle CCharacter::getMissionLastSuccess(const CMissionTemplate & te
 {
 	std::map< TAIAlias, TMissionHistory >::iterator it(_MissionHistories.find(templ.Alias));
 	if (it != _MissionHistories.end())
+	{
+		TGameCycle lastSuccessDate =  it->second.LastSuccessDate;
+
+		if (lastSuccessDate > CTickEventHandler::getGameCycle())
+			return 0;
+
 		return it->second.LastSuccessDate;
+	}
 	return 0;
 
 }
@@ -17049,6 +17381,9 @@ void CCharacter::setPVPFlag( bool pvpFlag )
 		//  set the new pvp flag and time last change for apply timer delay before this change become effective
 		if( pvpFlag == false )
 		{
+			if (_PVPFlagTimeSettedOn > CTickEventHandler::getGameCycle())
+				_PVPFlagTimeSettedOn = CTickEventHandler::getGameCycle() - TimeForResetPVPFlag;
+
 			if( _PVPFlagTimeSettedOn + TimeForResetPVPFlag > CTickEventHandler::getGameCycle() )
 			{
 				// we need wait a minimal of time before reset your pvp tag
@@ -17146,13 +17481,6 @@ void CCharacter::setPVPRecentActionFlag(CCharacter *target)
 
 	_PVPRecentActionTime = CTickEventHandler::getGameCycle();
 
-	if (target != NULL)
-	{
-		_PVPFlagAlly |= target->getPVPFamesAllies();
-		_PVPFlagEnemy |= target->getPVPFamesEnemies();
-		updatePVPClanVP();
-	}
-
 //	_PropertyDatabase.setProp("CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT", _PVPRecentActionTime + PVPActionTimer );
 	CBankAccessor_PLR::getCHARACTER_INFO().getPVP_FACTION_TAG().setFLAG_PVP_TIME_LEFT(_PropertyDatabase, _PVPRecentActionTime + PVPActionTimer );
 
@@ -17880,7 +18208,7 @@ void CPetAnimal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 //-----------------------------------------------------------------------------
-uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
+uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c, uint8 index )
 {
 	if( c )
 	{
@@ -17888,6 +18216,8 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 		if( ( ItemPtr != 0 ) && ( ItemPtr->getStaticForm() != NULL ) && ( ItemPtr->getStaticForm()->Family == ITEMFAMILY::PET_ANIMAL_TICKET ) )
 		{
 //			Slot = ItemPtr->getLocSlot();
+			ItemPtr->setPetIndex(index);
+			ItemPtr->setCustomName(CustomName);
 			Slot = ItemPtr->getInventorySlot();
 			return Slot;
 		}
@@ -17900,6 +18230,8 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 			{
 //				Slot = ItemPtr->getLocSlot();
 				Slot = ItemPtr->getInventorySlot();
+				ItemPtr->setPetIndex(index);
+				ItemPtr->setCustomName(CustomName);
 				return Slot;
 			}
 			else
@@ -17916,7 +18248,6 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 	return INVENTORIES::INVALID_INVENTORY_SLOT;
 }
 
-
 //-----------------------------------------------
 // getAnimalMaxBulk
 //-----------------------------------------------
@@ -18697,8 +19028,42 @@ void CCharacter::teleportCharacter( sint32 x, sint32 y)
 void CCharacter::setTeamId(uint16 id)
 {
 	_TeamId = id;
+	updatePVPClanVP();
 }
 
+void CCharacter::setLeagueId(TChanID id, bool removeIfEmpty)
+{
+
+	ucstring name = CEntityIdTranslator::getInstance()->getByEntity(getId());
+	CEntityIdTranslator::removeShardFromName(name);
+
+	// Remove old dynamic channel
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+	{
+		CPVPManager2::getInstance()->broadcastMessage(_LeagueId, string("<INFO>"), name+" -->[]");
+		PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "TEAM_QUIT_LEAGUE");
+		DynChatEGS.removeSession(_LeagueId, getEntityRowId());		
+		
+		vector<CEntityId> players;
+		bool isEmpty = DynChatEGS.getPlayersInChan(_LeagueId, players);
+				
+		if (isEmpty)
+		{
+			if (removeIfEmpty)
+				DynChatEGS.removeChan(_LeagueId);
+		}
+	}
+
+	if (id != DYN_CHAT_INVALID_CHAN)
+	{
+		PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "TEAM_JOIN_LEAGUE");
+		DynChatEGS.addSession(id, getEntityRowId(), true);
+		CPVPManager2::getInstance()->broadcastMessage(id, string("<INFO>"), "<-- "+name);
+	}
+
+	_LeagueId = id;
+	updatePVPClanVP();
+}
 
 //------------------------------------------------------------------------------
 
@@ -18707,6 +19072,12 @@ void CCharacter::setTeamInvitor(const NLMISC::CEntityId & invitorId)
 	_TeamInvitor = invitorId;
 }
 
+//------------------------------------------------------------------------------
+
+void CCharacter::setLeagueInvitor(const NLMISC::CEntityId & invitorId)
+{
+	_LeagueInvitor = invitorId;
+}
 
 //------------------------------------------------------------------------------
 
@@ -19871,6 +20242,13 @@ void CCharacter::setPriviledgePVP( bool b )
 	_PriviledgePvp = b;
 }
 
+//------------------------------------------------------------------------------
+
+void CCharacter::setFullPVP( bool b )
+{
+	_FullPvp = b;
+}
+
 
 //------------------------------------------------------------------------------
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h
index c9482fdd0..b0d30b202 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h
@@ -21,6 +21,7 @@
 // Game Share
 #include "game_share/bot_chat_types.h"
 #include "game_share/brick_flags.h"
+#include "server_share/pet_interface_msg.h"
 #include "game_share/power_types.h"
 #include "game_share/roles.h"
 #include "game_share/temp_inventory_mode.h"
@@ -297,6 +298,7 @@ struct CPetAnimal
 	bool				IsMounted;
 	bool				IsTpAllowed;
 	bool				spawnFlag;
+	ucstring			CustomName;
 	
 	// ctor
 	CPetAnimal();
@@ -305,10 +307,12 @@ struct CPetAnimal
 	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
 
 	// init found ticket item pointer with slot
-	uint32 initLinkAnimalToTicket( CCharacter * c );
+	uint32 initLinkAnimalToTicket( CCharacter * c, uint8 index);
 
 	// get the max bulk of the animal inventory
 	uint32 getAnimalMaxBulk();
+
+	void setCustomName(const ucstring& customName) { CustomName = customName; }
 };
 
 /**
@@ -416,6 +420,10 @@ private:
 		RemoveFriend,
 		RemoveIgnored,
 		
+		AddedAsLeague,
+		RemovedFromLeague,
+		RemoveLeague,
+
 		NB_CONTACT_LIST_ACTIONS,
 		UnknownContactListAction= NB_CONTACT_LIST_ACTIONS,
 	};
@@ -737,6 +745,9 @@ public:
 
 	// return the season in which is the current character
 	uint8 getRingSeason() const { return _RingSeason;}
+
+	/// get the League id
+	TChanID getLeagueId() const { return _LeagueId;}
 	
 	
 		
@@ -746,10 +757,16 @@ public:
 	uint16 getTeamId() const;
 	/// set the team Id of this player
 	void setTeamId(uint16 id);
+	/// set the League id
+	void setLeagueId(TChanID id, bool removeIfEmpty=false);
 	/// get team invitor
 	const NLMISC::CEntityId & getTeamInvitor() const;
 	/// set team invitor
 	void setTeamInvitor(const NLMISC::CEntityId & invitorId);
+	/// get League invitor
+	const NLMISC::CEntityId & getLeagueInvitor() const;
+	/// set League invitor
+	void setLeagueInvitor(const NLMISC::CEntityId & invitorId);
 	//@}
 
 	/// Set fighting target
@@ -975,6 +992,11 @@ public:
 	// return the index of a player pet, or -1 if not found
 	sint32 getPlayerPet( const TDataSetRow& petRowId ) const;
 
+	// Set the name of the animal
+	void setAnimalName( uint8 petIndex, ucstring customName );
+
+	void sendPetCustomNameToClient(uint8 petIndex);
+
 	// near character's pets are TP with player (continent tp)
 	void allowNearPetTp();
 	bool isNearPetTpIsAllowed() const;
@@ -1151,6 +1173,12 @@ public:
 	/// get the number of faction point given a faction
 	uint32	getFactionPoint(PVP_CLAN::TPVPClan clan);
 
+	/// set the number of pvp point
+	void	setPvpPoint(uint32 nbPt);
+
+	/// get the number of pvp point given a faction
+	uint32	getPvpPoint();
+
 	/// set the SDB path where player wins HoF points in PvP (if not empty)
 	void	setSDBPvPPath(const std::string & sdbPvPPath);
 
@@ -1160,6 +1188,15 @@ public:
 	/// init faction point in client database
 	void	initFactionPointDb();
 
+	/// init pvp point in client database
+	void	initPvpPointDb();
+
+	void initOrganizationInfos();
+	void setOrganization(uint32 org);
+	void setOrganizationStatus(uint32 status);
+	void changeOrganizationStatus(sint32 status);
+	void changeOrganizationPoints(sint32 points);
+
 	/// send faction point gain phrase to the client
 	void	sendFactionPointGainMessage(PVP_CLAN::TPVPClan clan, uint32 fpGain);
 	/// send faction point gain kill phrase to the client
@@ -1614,6 +1651,18 @@ public:
 	/// send custom url
 	void sendUrl(const std::string &url, const std::string &salt);
 
+	/// set custom mission param
+ 	void setCustomMissionParams(const std::string &missionName, const std::string &params);
+
+ 	/// add custom mission param
+ 	void addCustomMissionParam(const std::string &missionName, const std::string &param);
+
+ 	/// get custom mission params
+ 	std::vector<std::string> getCustomMissionParams(const std::string &missionName);
+
+ 	/// validate dynamic mission step sending url
+ 	void validateDynamicMissionStep(const std::string &url);
+
 	/// add web command validation check
 	void addWebCommandCheck(const std::string &url, const std::string &data, const std::string &salt);
 
@@ -1856,15 +1905,18 @@ public:
 		/// add a player to friend list by name
 		void addPlayerToFriendList(const ucstring &name);
 
-		/// add a player to friend list by id
-		void addPlayerToFriendList(const NLMISC::CEntityId &id);
-
 		/// add a player to ignore list by name
 		void addPlayerToIgnoreList(const ucstring &name);
 
 		/// add a player to ignore list by Id
 		void addPlayerToIgnoreList(const NLMISC::CEntityId &id);
 		
+		/// add a player to league list by id
+		void addPlayerToLeagueList(const NLMISC::CEntityId &id);
+
+		/// add a player to friend list by id
+		void addPlayerToFriendList(const NLMISC::CEntityId &id);
+
 		/// get a player from friend or ignore list, by contact id
 		const NLMISC::CEntityId	&getFriendByContactId(uint32 contactId);
 		const NLMISC::CEntityId	&getIgnoreByContactId(uint32 contactId);
@@ -1885,6 +1937,9 @@ public:
 		/// remove room acces to player
 		void removeRoomAccesToPlayer(const NLMISC::CEntityId &id, bool kick);
 
+		/// remove player from league list
+		void removePlayerFromLeagueListByContactId(uint32 contactId);
+		void removePlayerFromLeagueListByEntityId(const NLMISC::CEntityId &id);
 
 		/// remove player from ignore list
 		void removePlayerFromIgnoreListByContactId(uint32 contactId);
@@ -1923,6 +1978,9 @@ public:
 		/// player is going online or offline
 		void online(bool onlineStatus);
 
+		/// player last connection date (from SU, exactly like on mysql db)
+		void setLastConnectionDate(uint32 date);
+
 		/// player is permanently erased, unreferenced it from all contact lists
 		void destroyCharacter();
 
@@ -2230,6 +2288,8 @@ public:
 	// priviledge PVP mode
 	void setPriviledgePVP( bool b );
 	bool priviledgePVP();
+	// full PVP mode
+	void setFullPVP( bool b );
 	/// set the current PVP zone where the player is
 	void setCurrentPVPZone(TAIAlias alias);
 	/// get the current PVP zone where the player is
@@ -2246,6 +2306,8 @@ public:
 	void openPVPVersusDialog() const;
 	/// get priviledgePvp
 	bool getPriviledgePVP() const {return _PriviledgePvp;};
+	/// get fullPvp
+	bool getFullPVP() const {return _FullPvp;};
 	/// get character pvp flag
 	bool getPVPFlag( bool updatePVPModeInMirror = true ) const;
 	/// change pvp flag
@@ -2274,7 +2336,7 @@ public:
 	/// Set an allegiance to neutral from indetermined status, used for process message from client want set it's allegiance to neutral when it's idetermined, over case are managed by missions. 
 	void setAllegianceFromIndeterminedStatus(PVP_CLAN::TPVPClan allegiance);
 	/// true if pvp safe zone active for character
-	bool getSafeInPvPSafeZone();
+	bool getSafeInPvPSafeZone() const;
 	/// set pvp safe zone to true
 	void setPvPSafeZoneActive();
 	/// clear pvp zone safe flag
@@ -2316,7 +2378,9 @@ public:
 	/// character log stats accessors
 	uint32 getFirstConnectedTime() const;
 	uint32 getLastConnectedTime() const;
+	uint32 getLastConnectedDate() const;
 	uint32 getPlayedTime() const;
+	uint32 getOrganization() const;
 	const std::list<TCharacterLogTime>& getLastLogStats() const;
 	void updateConnexionStat();
 	void setDisconnexionTime();		
@@ -2327,9 +2391,9 @@ public:
 	void haveToUpdateItemsPrerequisit( bool b );
 
 	void channelAdded( bool b );
-	bool isChannelAdded();
+	bool isChannelAdded() const;
 
-	uint8 getNbUserChannels() { return _NbUserChannels; };
+	uint8 getNbUserChannels() const { return _NbUserChannels; };
 	void addUserChannel() { _NbUserChannels++; };
 	void removeUserChannel() { _NbUserChannels--; };
 
@@ -2635,6 +2699,8 @@ private:
 
 	/// remove player from friend list
 	void removePlayerFromFriendListByIndex(uint16 index);
+	/// remove player from league list
+	void removePlayerFromLeagueListByIndex(uint16 index);
 	/// remove player from ignore list
 	void removePlayerFromIgnoreListByIndex(uint16 index);
 	
@@ -2934,6 +3000,12 @@ private:
 
 	uint32								_FactionPoint[PVP_CLAN::EndClans-PVP_CLAN::BeginClans+1];
 
+	uint32								_PvpPoint;
+
+	uint32								_Organization;
+	uint32								_OrganizationStatus;
+	uint32								_OrganizationPoints;
+
 	/// SDB path where player wins HoF points in PvP (if not empty)
 	std::string							_SDBPvPPath;
 	
@@ -2944,9 +3016,14 @@ private:
 	/// if this player has an invitation for another team, keep the team here
 	NLMISC::CEntityId 					_TeamInvitor;
 
+	/// if this player has an invitation for League, keep the invitor here
+	NLMISC::CEntityId 					_LeagueInvitor;
+
 	// id of the current team
 	CMirrorPropValueAlice< uint16, CPropLocationPacked<2> >	_TeamId;
 	
+	TChanID								_LeagueId;
+
 	/// temp values used to test if team bars need an update or not
 	mutable uint8						_OldHpBarSentToTeam;
 	mutable uint8						_OldSapBarSentToTeam;
@@ -3178,6 +3255,11 @@ private:
 	/// nb of users channels
 	uint8						_NbUserChannels;
 
+	/// last webcommand index
+	uint32						_LastWebCommandIndex;
+
+ 	std::map<std::string, std::string>	_CustomMissionsParams;
+
 	// for a power/combat event, stores start and end ticks
 	struct CFlagTickRange {
 
@@ -3243,6 +3325,8 @@ private:
 
 	// friends list
 	std::vector<CContactId>	_FriendsList;
+	// league list
+	std::vector<CContactId>	_LeagueList;
 	// ignore list
 	std::vector<CContactId>	_IgnoreList;
 	// list of players for whom this player is in the friendlist (to update online status and to remove from players list if this char is permanently deleted)
@@ -3380,8 +3464,14 @@ private:
 	CPVPInterface					*_PVPInterface;
 	// set pvp mode for priviledge player
 	bool							_PriviledgePvp;
+	// set full pvp mode for player
+	bool							_FullPvp;
 	// flag PVP, true for player involved in Faction PVP and other PVP
 	bool							_PVPFlag;
+	// time of last change in pvp safe
+	NLMISC::TGameCycle				_PVPSafeLastTimeChange;
+	bool							_PVPSafeLastTime;
+	bool							_PVPInSafeZoneLastTime;
 	// time of last change in pvp flag (for prevent change PVP flag exploits)
 	NLMISC::TGameCycle				_PVPFlagLastTimeChange;
 	// time of pvp flag are setted to on (for prevent change PVP flag exploits)
@@ -3571,7 +3661,8 @@ private:
 	std::set<NLMISC::CEntityId>		_EntitiesToSaveWithMe;
 
 	uint32 _FirstConnectedTime;						//first connected time in second since midnight (00:00:00), January 1, 1970
-	uint32 _LastConnectedTime;						//last connected time in second since midnight (00:00:00), January 1, 1970
+	uint32 _LastConnectedTime;						//last connected time in second since midnight (00:00:00), January 1, 1970 (change each tick update)
+	uint32 _LastConnectedDate;						//last connected time in second since midnight (00:00:00), January 1, 1970 (never change after login, exactly like in mysql db)
 	uint32 _PlayedTime;								//cumulated played time in second
 	mutable std::list<TCharacterLogTime> _LastLogStats;		//keep n login/duration/logoff time
 
@@ -3625,6 +3716,11 @@ private:
 	/// General god flag for persistence
 	bool			_GodModeSave;
 public:
+
+	void			setWebCommandIndex(uint32 index) { _LastWebCommandIndex = index;}
+	uint32			getWebCommandIndex() const { return _LastWebCommandIndex;}
+
+
 	bool			getInvisibility() const	{ return _Invisibility;}
 	/// Set the invisibility flag, NB : just for persistence, do not change nothing.
 	void			setInvisibility(bool invisible)
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
index 4d9f51fdb..f50e57386 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
@@ -131,6 +131,13 @@ inline const NLMISC::CEntityId & CCharacter::getTeamInvitor() const
 
 //------------------------------------------------------------------------------
 
+inline const NLMISC::CEntityId & CCharacter::getLeagueInvitor() const
+{
+	return _LeagueInvitor; 
+}
+
+//------------------------------------------------------------------------------
+
 inline const NLMISC::CEntityId &CCharacter::harvestedEntity() const
 {
 	return _MpSourceId; 
@@ -847,7 +854,7 @@ inline uint16 CCharacter::getKilledPvPRegion()
 
 //------------------------------------------------------------------------------
 
-inline bool CCharacter::getSafeInPvPSafeZone()
+inline bool CCharacter::getSafeInPvPSafeZone() const
 {
 	return _PvPSafeZoneActive; 
 }
@@ -875,11 +882,26 @@ inline uint32 CCharacter::getLastConnectedTime() const
 
 //------------------------------------------------------------------------------
 
+inline uint32 CCharacter::getLastConnectedDate() const
+{
+	return _LastConnectedDate; 
+}
+
+//------------------------------------------------------------------------------
+
 inline uint32 CCharacter::getPlayedTime() const
 {
 	return _PlayedTime; 
 }
 
+//------------------------------------------------------------------------------
+
+inline uint32 CCharacter::getOrganization() const
+{
+	return _Organization; 
+}
+
+
 //------------------------------------------------------------------------------
 
 inline const std::list<TCharacterLogTime>& CCharacter::getLastLogStats() const
@@ -889,7 +911,7 @@ inline const std::list<TCharacterLogTime>& CCharacter::getLastLogStats() const
 
 //------------------------------------------------------------------------------
 
-inline bool CCharacter::isChannelAdded()
+inline bool CCharacter::isChannelAdded() const
 {
 	return _ChannelAdded; 
 }
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h b/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
index 05958655c..ffa525556 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
@@ -126,6 +126,9 @@ public:
 
 	virtual void setContactOnlineStatus(const NLMISC::CEntityId &charEid, bool connection) =0;
 
+	virtual void setLastConnectionDate(uint32 date) =0;
+
+
 	virtual void syncContactListWithCharNameChanges(const std::vector<NLMISC::CEntityId> &charNameChanges)=0;
 
 	virtual void updateTargetingChars()=0;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
index 6818a8b73..db7d0c22b 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
@@ -2443,7 +2443,7 @@ void CCharacter::sendItemInfos( uint16 slotId )
 		infos.TypeSkillMods = item->getTypeSkillMods();
 		
 		// Special case of web missions items
-		if (item->getStaticForm()->Name == "Web Transaction" || item->getStaticForm()->Family == ITEMFAMILY::SCROLL)
+		if (item->getStaticForm()->Name == "Web Transaction")
 		{
 			string cText = item->getCustomText().toString();
 			string::size_type sPos = cText.find(" ");
@@ -2453,11 +2453,16 @@ void CCharacter::sendItemInfos( uint16 slotId )
 				string cUrl = cText.substr(sPos, ePos-sPos);
 				infos.CustomText = ucstring("@WEBIG "+cUrl);
 			}
-			else
-				infos.CustomText = "";
 		}
 		else
+		{
 			infos.CustomText = item->getCustomText();
+		}
+		
+		if (item->getPetIndex() < MAX_INVENTORY_ANIMAL)
+		{
+			infos.PetNumber = item->getPetIndex() + 1;
+		}
 
 		CMessage msgout( "IMPULSION_ID" );
 		CBitMemStream bms;
@@ -2912,7 +2917,8 @@ void CCharacter::useItem(uint32 slot)
 	{
 		pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegeance = getAllegiance();
 		if ((form->TpType == TELEPORT_TYPES::KAMI) && (allegeance.first == PVP_CLAN::Karavan)
-			|| (form->TpType == TELEPORT_TYPES::KARAVAN) && (allegeance.first == PVP_CLAN::Kami))
+			|| (form->TpType == TELEPORT_TYPES::KARAVAN) && (allegeance.first == PVP_CLAN::Kami)
+			|| getOrganization() == 5 ) //marauder
 		{
 			CCharacter::sendDynamicSystemMessage(_Id, "ALTAR_RESTRICTION");
 			return;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
index 542135aa9..1ffbc9c81 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
@@ -414,6 +414,10 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
 	_FactionPoint[i],\
 	PVP_CLAN::TPVPClan k=PVP_CLAN::fromString(key); if ((k>=PVP_CLAN::BeginClans) && (k<=PVP_CLAN::EndClans)) _FactionPoint[k-PVP_CLAN::BeginClans]=val)\
 \
+	PROP(uint32,_PvpPoint)\
+	PROP(uint32,_Organization)\
+	PROP(uint32,_OrganizationStatus)\
+	PROP(uint32,_OrganizationPoints)\
 	PROP2(DeclaredCult,string,PVP_CLAN::toString(_DeclaredCult),_DeclaredCult=PVP_CLAN::fromString(val))\
 	PROP2(DeclaredCiv,string,PVP_CLAN::toString(_DeclaredCiv),_DeclaredCiv=PVP_CLAN::fromString(val))\
 \
@@ -688,6 +692,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
 	LPROP(bool,IsMounted,if(IsMounted))\
 	PROP(bool,IsTpAllowed)\
 	PROP(TSatiety,Satiety)\
+	PROP2(CustomName, ucstring, CustomName, CustomName = val)\
 
 //#pragma message( PERSISTENT_GENERATION_MESSAGE )
 #include "game_share/persistent_data_template.h"
@@ -1183,7 +1188,7 @@ static void displayWarning(const std::string& s)
 //-----------------------------------------------------------------------------
 /**
  * This class is used to load old player room inventory, DO NOT BREAK IT!
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -1345,6 +1350,7 @@ private:
 	STRUCT_VECT(_TypeSkillMods)\
 	LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\
 	PROP2(_CustomText,					ucstring,	_CustomText,				_CustomText=val)\
+	PROP(bool, _LockedByOwner)\
 	
 //#pragma message( PERSISTENT_GENERATION_MESSAGE )
 #include "game_share/persistent_data_template.h"
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
index 36d2022e4..ef77550c1 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
@@ -2357,7 +2357,7 @@ void CPlayerManager::broadcastMessageUpdate()
 		msg= msg.replace("$seconds$",secondsStr.c_str());
 		msg= msg.replace("$minutes$",minutesStr.c_str());
 		msg= msg.replace("$hours$",hoursStr.c_str());
-		nlinfo("braodcasting message: %s",msg.c_str());
+		nlinfo("broadcasting message: %s",msg.c_str());
 
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
 		params[0].Literal.fromUtf8(msg);
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
index 94b230ca0..bce6d46c6 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
@@ -1095,14 +1095,14 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 
 	nlassert(victimChar != NULL);
 
-	PVP_CLAN::TPVPClan victimFaction;
-	bool victimLosesFactionPoints;
-	if (!playerInFactionPvP(victimChar, &victimFaction, &victimLosesFactionPoints))
-		return;
+//	PVP_CLAN::TPVPClan victimFaction;
+	bool victimLosesFactionPoints = false;
+//	if (!playerInFactionPvP(victimChar, &victimFaction, &victimLosesFactionPoints))
+//		return;
 
-	PVP_CLAN::TPVPClan finalBlowerFaction;
-	if (!playerInFactionPvP(finalBlower, &finalBlowerFaction))
-		return;
+//	PVP_CLAN::TPVPClan finalBlowerFaction;
+//	if (!playerInFactionPvP(finalBlower, &finalBlowerFaction))
+//		return;
 
 	// check if victim and final blower are in PvP Faction (by tag or by a pvp versus zone)
 	/* if(!CPVPManager2::getInstance()->factionWarOccurs(victimFaction, finalBlowerFaction))
@@ -1204,9 +1204,13 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 			BOMB_IF(winnerChar == NULL, "invalid winner!", continue);
 
 			PVP_CLAN::TPVPClan winnerFaction;
-			bool winnerGainFactionPoints;
-			if(!playerInFactionPvP(winnerChar, &winnerFaction, &winnerGainFactionPoints))
-				continue; // can be in Duel or in other pvp mode.
+			bool winnerGainFactionPoints = true;
+
+			if (!canPlayerWinPoints(winnerChar, victimChar))
+				continue;
+
+			//if(!playerInFactionPvP(winnerChar, &winnerFaction, &winnerGainFactionPoints))
+			//	continue; // can be in Duel or in other pvp mode.
 
 			CRewardedKills::CRewardedKiller * noPointPlayer = getRewardedKiller(winnerChar->getId(), noPointPlayers);
 			if (noPointPlayer != NULL)
@@ -1227,9 +1231,27 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 
 			if (winnerGainFactionPoints)
 			{
+				// Compute Fames delta
+				sint32 fameFactor = 0;
+				for (uint8 fameIdx = 0; fameIdx < 7; fameIdx++)
+				{
+					sint32 victimFame = CFameInterface::getInstance().getFameIndexed(victimChar->getId(), fameIdx);
+					sint32 winnerFame = CFameInterface::getInstance().getFameIndexed(winnerChar->getId(), fameIdx);
+
+					if ( (victimFame >= 25*6000 && winnerFame <= -25*6000) || 
+						 (winnerFame >= 25*6000 && victimFame <= -25*6000) )
+						fameFactor++;
+
+					if ( (victimFame >= 25*6000 && winnerFame >= 25*6000) || 
+						 (victimFame <= -25*6000 && winnerFame <= -25*6000) )
+						fameFactor--;						
+				}
+				clamp(fameFactor, 0, 3);
+				nlinfo("points = %d * %d", fpPerPlayer, fameFactor);
+
 				// player gains faction points
-				changePlayerFactionPoints(winnerChar, winnerFaction, sint32(fpPerPlayer));
-				winnerChar->sendFactionPointGainKillMessage(winnerFaction, fpPerPlayer, victimChar->getId());
+				changePlayerPvpPoints(winnerChar, sint32(fpPerPlayer) * fameFactor);
+				winnerChar->sendFactionPointGainKillMessage(winnerFaction, fpPerPlayer * fameFactor, victimChar->getId());
 			}
 
 			// player gains HoF points
@@ -1237,13 +1259,14 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 			// and a way for known if an episode occurs (and specs for known if other episode pemrti to win HoF point...)
 			//changePlayerHoFPoints(winnerChar, sint32(hofpPerPlayer));
 
+			/*
 			// PvP faction winner HOF reward
 			CPVPManager2::getInstance()->characterKillerInPvPFaction( winnerChar, winnerFaction, (sint32)fpPerPlayer );
 			if( finalBlower == winnerChar )
 			{
 				CPVPManager2::getInstance()->finalBlowerKillerInPvPFaction( winnerChar, winnerFaction, victimChar );
 			}
-
+			*/
 			rewardedKillers.push_back(winnerChar->getId());
 			nbRewardedMembers++;
 		}
@@ -1273,7 +1296,7 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 	hofpLoss = uint32(double(hofpLoss) * PVPHoFPointLossFactor.get() + 0.5);
 
 	// keep the point loss to apply if the victim respawn
-	CPointLoss pointLoss;
+	/*CPointLoss pointLoss;
 	pointLoss.PlayerLosesFactionPoints	= victimLosesFactionPoints;
 	pointLoss.PlayerFaction				= victimFaction;
 	pointLoss.FactionPointLoss			= fpLoss;
@@ -1282,8 +1305,8 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 	_PointLossByPlayer[victimChar->getId()] = pointLoss;
 
 	// PvP faction looser lost
-	CPVPManager2::getInstance()->characterKilledInPvPFaction( victimChar, victimFaction, -(sint32) fpLoss );
-
+	//CPVPManager2::getInstance()->characterKilledInPvPFaction( victimChar, victimFaction, -(sint32) fpLoss );
+*/
 	// delete the score table of the victim
 	removeDamageScoreTable(victimChar->getEntityRowId());
 }
@@ -1429,6 +1452,7 @@ void CDamageScoreManager::playerRespawn(CCharacter * victimChar)
 
 	const CPointLoss & pointLoss = (*it).second;
 
+	/*
 	if (pointLoss.PlayerLosesFactionPoints)
 	{
 		// victim loses faction points
@@ -1438,6 +1462,7 @@ void CDamageScoreManager::playerRespawn(CCharacter * victimChar)
 
 	// victim loses HoF points
 	changePlayerHoFPoints(victimChar, -sint32(pointLoss.HoFPointLoss));
+	*/
 
 	// remove the applied entry
 	_PointLossByPlayer.erase(it);
@@ -1684,9 +1709,9 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 			return true;
 		}
 	}
-	else if( playerChar->getPVPFlag() )
+	else if( playerChar->getPVPFlag(false) )
 	{ 
-		pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegiance = playerChar->getAllegiance();
+		/*pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegiance = playerChar->getAllegiance();
 		if( (allegiance.first != PVP_CLAN::Neutral) && (allegiance.first != PVP_CLAN::None) )
 		{
 			if (faction)
@@ -1695,7 +1720,7 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 				*withFactionPoints = true;
 			return true;
 		}
-		/*if ( allegiance.second != PVP_CLAN::Neutral)
+		if ( allegiance.second != PVP_CLAN::Neutral)
 		{
 			if (faction)
 				*faction = allegiance.second;
@@ -1703,10 +1728,45 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 				*withFactionPoints = true;
 			return true;
 		}*/
+		return true;
 	}
 	return false;
 }
 
+bool CDamageScoreManager::canPlayerWinPoints(const CCharacter * winnerChar,  CCharacter * victimeChar) const
+{
+	// Don't win points if in duel
+	if ( winnerChar->getDuelOpponent() && (winnerChar->getDuelOpponent()->getId() == victimeChar->getId()) )
+		return false;
+
+	if (victimeChar->getPVPRecentActionFlag())
+		nlinfo("PVP recent flag");
+	// Only win points if victime is Flag
+	if( winnerChar->getPVPFlag(false))
+	{
+		 if ( true/*victimeChar->getPVPRecentActionFlag()*/ )
+		 {
+			nlinfo("Teams : %d, %d", winnerChar->getTeamId(), victimeChar->getTeamId());
+			// Don't win points if in same Team
+			if ( winnerChar->getTeamId() != CTEAM::InvalidTeamId && victimeChar->getTeamId() != CTEAM::InvalidTeamId && (winnerChar->getTeamId() == victimeChar->getTeamId()) )
+				return false;
+
+			// Don't win points if in same Guild
+			nlinfo("Guild : %d, %d", winnerChar->getGuildId(), victimeChar->getGuildId());
+			if ( winnerChar->getGuildId() != 0 && victimeChar->getGuildId() != 0 && (winnerChar->getGuildId() == victimeChar->getGuildId()) )
+				return false;
+
+			// Don't win points if in same League
+			if ( winnerChar->getLeagueId() != DYN_CHAT_INVALID_CHAN && victimeChar->getLeagueId() != DYN_CHAT_INVALID_CHAN && (winnerChar->getLeagueId() == victimeChar->getLeagueId()) )
+				return false;
+
+			return true;
+		 }
+	}
+
+	return false;
+}
+
 //-----------------------------------------------------------------------------
 uint32 CDamageScoreManager::computeFactionPointsForWinner(const CDamageScoreTable::CWinner & winner, uint32 victimSkillValue)
 {
@@ -1795,6 +1855,28 @@ sint32 CDamageScoreManager::changePlayerFactionPoints(CCharacter * playerChar, P
 	return fpDelta;
 }
 
+//-----------------------------------------------------------------------------
+sint32 CDamageScoreManager::changePlayerPvpPoints(CCharacter * playerChar, sint32 fpDelta)
+{
+	nlassert(playerChar != NULL);
+
+	if (fpDelta == 0)
+		return 0;
+
+	uint32 points = playerChar->getPvpPoint();
+
+	// player cannot have negative pvp points
+	fpDelta = max(fpDelta, -sint32(points));
+
+	points += fpDelta;
+
+	// set the new pvp points
+	playerChar->setPvpPoint(points);
+
+	return fpDelta;
+}
+
+
 //-----------------------------------------------------------------------------
 void CDamageScoreManager::changePlayerHoFPoints(CCharacter * playerChar, sint32 hofpDelta)
 {
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
index 30866991f..e2ed4b28f 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
@@ -42,7 +42,7 @@ typedef uint16 TTeamId;
 /**
  * A damage score table keeps all damages done by a player/team/creature on a player
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -193,7 +193,7 @@ private:
  * It permits to find all players wounded by an entity (player/team/creature)
  * ie to find all players on which the entity has a damage score.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -229,7 +229,7 @@ private:
 /**
  * It keeps kills that have been rewarded and which cannot be rewarded again for a lapse of time.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -273,7 +273,7 @@ private:
  * and keeps their damage scores on each attacked player.
  * It also gives faction and HoF points to players.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -342,6 +342,8 @@ private:
 	/// return true if the given action is curative
 	bool isCurativeAction(const TReportAction & action) const;
 
+	bool canPlayerWinPoints(const CCharacter * winnerChar, CCharacter * victimeChar) const;
+
 	/// return true if the given player is in 'faction PvP' (in a faction PvP zone)
 	/// \param faction : if not NULL return the faction of the player in the PvP zone where he is
 	/// \param gainFactionPoints : if not NULL return true if the zone gives faction points or not
@@ -357,6 +359,10 @@ private:
 	/// \return the applied delta (a negative delta may have been modified up to zero to keep faction points positive)
 	sint32 changePlayerFactionPoints(CCharacter * playerChar, PVP_CLAN::TPVPClan faction, sint32 fpDelta);
 
+	/// add/remove pvp points to a player
+	/// \return the applied delta (a negative delta may have been modified up to zero to keep pvp points positive)
+	sint32 changePlayerPvpPoints(CCharacter * playerChar, sint32 fpDelta);
+
 	/// add/remove HoF points to a player and his guild if his SDB PvP path is defined
 	void changePlayerHoFPoints(CCharacter * playerChar, sint32 hofpDelta);
 
@@ -388,7 +394,7 @@ private:
 /**
  * This is the interface for the character progression in PvP
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
index 95bdf73a4..e108d68e7 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
@@ -39,6 +39,13 @@ PVP_RELATION::TPVPRelation CPVPFaction::getPVPRelation( CCharacter * actor, CEnt
 	CPVPManager2::getInstance()->setPVPFactionAllyReminder( false );
 	CPVPManager2::getInstance()->setPVPFactionEnemyReminder( false );
 
+	bool isAlly = false;
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+	bool targetInSafeZone = false;
+	bool actorInSafeZone = false;
+
 	// Check actor and target validity
 	if (actor == 0 || target == 0)
 	{
@@ -50,70 +57,85 @@ PVP_RELATION::TPVPRelation CPVPFaction::getPVPRelation( CCharacter * actor, CEnt
 	if (pTarget == 0)
 		return PVP_RELATION::Unknown;
 
-	// if target is not tagged then he's neutral
-	if (!pTarget->getPVPFlag() && !pTarget->getPvPRecentActionFlag())
-		return PVP_RELATION::Neutral;
-
-	// Check safe zones
 	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
 	{
+		targetInSafeZone = true;
 		if (pTarget->getSafeInPvPSafeZone())
-			return PVP_RELATION::NeutralPVP;
+			targetSafe = true;
 	}
 
 	if( CPVPManager2::getInstance()->inSafeZone(actor->getPosition()))
 	{
+		actorInSafeZone = true;
 		if( actor->getSafeInPvPSafeZone())
-			return PVP_RELATION::NeutralPVP;
+			actorSafe = true;
 	}
+	
+	// Target is not tagged => Neutral
+	if (!pTarget->getPVPFlag() && !pTarget->getPvPRecentActionFlag())
+		return PVP_RELATION::Neutral;
 
-	// Check fames
-	if( actor->getPVPFlag() || actor->getPvPRecentActionFlag() )
+	// Actor is not tagged => Check target
+	if (!actor->getPVPFlag() && !actor->getPvPRecentActionFlag())
 	{
-		// In same Team
-		if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
-		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder( true );
-			return PVP_RELATION::Ally;
-		}
-
-		// In same Guild
-		if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()))
-		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder( true );
-			return PVP_RELATION::Ally;
-		}
-
-		// check if he's an ennemy
-		if ((actor->getPVPFamesAllies() & pTarget->getPVPFamesEnemies()) || (actor->getPVPFamesEnemies() & pTarget->getPVPFamesAllies()))
-		{
-			// Actor can heal an ennemi if not PvPRecentActionFlaged
-			if (curative && !pTarget->getPvPRecentActionFlag())
-			{
-				return PVP_RELATION::Neutral;
-			}
-			else
-			{
-				CPVPManager2::getInstance()->setPVPFactionEnemyReminder(true);
-				return PVP_RELATION::Ennemy;
-			}
-		}
-		// check if he's an ally
-		else if ((actor->getPVPFamesAllies() & pTarget->getPVPFamesAllies()) || (actor->getPVPFamesEnemies() & pTarget->getPVPFamesEnemies()))
-		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder(true);
-			return PVP_RELATION::Ally;
-		}
-	}
-	else
-	{
-		// Check if actor is not PvPFlag and try to heal a PvPRecentActionFlag
-		if (curative && pTarget->getPvPRecentActionFlag())
+		// Target flag => NeutralPVP
+		if (pTarget->getPvPRecentActionFlag())
 			return PVP_RELATION::NeutralPVP;
+		else
+			return PVP_RELATION::Neutral;
 	}
 
-	// default is neutral
-	return PVP_RELATION::Neutral;
+
+	// In same Team => Ally
+	if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
+	{
+		isAlly = true;
+	}
+
+	// In Same League => Ally
+	if ((pTarget->getLeagueId() != DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() != DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() == pTarget->getLeagueId()))
+	{
+		isAlly = true;
+	}
+
+	// In same Guild and not Leagued => Ally
+	if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()) && (pTarget->getLeagueId() == DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() == DYN_CHAT_INVALID_CHAN))
+	{
+		isAlly = true;
+	}
+
+	if (isAlly)
+	{
+		// One is in safe zone but not other => NeutralPVP
+		if ((targetInSafeZone && !actorInSafeZone) || (actorInSafeZone && !targetInSafeZone))
+		{
+			return PVP_RELATION::NeutralPVP;
+		}
+		
+		// One is safe but not other => NeutralPVP
+		if (targetSafe != actorSafe)
+		{
+			return PVP_RELATION::NeutralPVP;
+		}
+
+		CPVPManager2::getInstance()->setPVPFactionAllyReminder(true);
+		return PVP_RELATION::Ally;
+	}
+	
+	// If one is safe => NeutralPVP
+	if (targetSafe || actorSafe)
+	{
+		return PVP_RELATION::NeutralPVP;
+	}
+	
+	// 
+	if ((targetInSafeZone && !pTarget->getPvPRecentActionFlag()) || (actorInSafeZone && !actor->getPvPRecentActionFlag()))
+	{
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	CPVPManager2::getInstance()->setPVPFactionEnemyReminder(true);
+	return PVP_RELATION::Ennemy;
 }
 
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
index 11ad5092b..5dcec508d 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
@@ -26,6 +26,7 @@
 #include "game_share/utils.h"
 #include "game_share/msg_client_server.h"
 #include "game_share/fame.h"
+#include "game_share/send_chat.h"
 
 #include "pvp_manager/pvp_manager_2.h"
 #include "pvp_manager/pvp_manager.h"
@@ -176,6 +177,21 @@ TChanID CPVPManager2::getUserDynChannel( const std::string& channelName)
 		return DYN_CHAT_INVALID_CHAN;
 }
 
+std::string CPVPManager2::getUserDynChannel(const TChanID& channelId)
+{
+	TMAPExtraFactionChannel::iterator it;
+	for (it = _UserChannel.begin(); it != _UserChannel.end(); ++it)
+	{
+		if ((*it).second == channelId)
+		{
+			return (*it).first;
+		}
+	}
+	// should not get here
+	nlassert(false);
+	return "";
+}
+
 const std::string & CPVPManager2::getPassUserChannel( TChanID channelId)
 {
 	// Search in user channels
@@ -353,7 +369,7 @@ void CPVPManager2::broadcastMessage(TChanID channel, const ucstring& speakerName
 	sendMessageViaMirror("IOS", msgout);
 }
 
-void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user)
+void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user, bool outputToSys)
 {
 	std::vector<NLMISC::CEntityId> lst;
 
@@ -361,21 +377,40 @@ void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user)
 	if(it != _UserChannelCharacters.end())
 	{
 		lst = (*it).second;
-		string players = "";
+		ucstring players;
+		uint32 shardId = CEntityIdTranslator::getInstance()->getEntityShardId(user->getId());
 		for (uint i = 0; i < lst.size(); i++)
 		{
-			players += "\n"+CEntityIdTranslator::getInstance()->getByEntity(lst[i]).toString();
+			ucstring name = CEntityIdTranslator::getInstance()->getByEntity(lst[i]);
+			if (shardId == CEntityIdTranslator::getInstance()->getEntityShardId(lst[i]))
+			{
+				// Same shard, remove shard from name
+				CEntityIdTranslator::removeShardFromName(name);
+			}
+			players += "\n" + name ;
 		}
 
-		CMessage msgout("DYN_CHAT:SERVICE_TELL");
-		msgout.serial(channel);
-		ucstring users = ucstring("<USERS>");
-		msgout.serial(const_cast<ucstring&>(users));	
 		TDataSetRow senderRow = TheDataset.getDataSetRow(user->getId());
-		msgout.serial(senderRow);
-		ucstring txt = ucstring(players);
-		msgout.serial(const_cast<ucstring&>(txt));
-		sendMessageViaMirror( "IOS", msgout);
+		if (outputToSys)
+		{
+			CCharacter::sendDynamicSystemMessage( user->getId(), "WHO_CHANNEL_INTRO" );
+			//players = "Players in channel \"" + getUserDynChannel(channel) + "\": " + players;
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = players;
+			CCharacter::sendDynamicSystemMessage( user->getId(), "LITERAL", params );
+		}
+		else
+		{
+			CMessage msgout("DYN_CHAT:SERVICE_TELL");
+			msgout.serial(channel);
+			ucstring users = ucstring("<USERS>");
+			msgout.serial(const_cast<ucstring&>(users));	
+			msgout.serial(senderRow);
+			ucstring txt = ucstring(players);
+			msgout.serial(const_cast<ucstring&>(txt));
+
+			sendMessageViaMirror("IOS", msgout);
+		}
 	}
 }
 
@@ -559,10 +594,10 @@ void CPVPManager2::playerTeleports(CCharacter * user)
 void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 {
 	nlassert(user);
-	uint8 pvpMode = 0;
+	TYPE_PVP_MODE pvpMode = 0;
 	
 	// Full pvp
-	if ( user->getPriviledgePVP() )
+	if ( user->getFullPVP() )
 	{
 		pvpMode |= PVP_MODE::PvpChallenge;
 	}
@@ -588,6 +623,16 @@ void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 			pvpMode |= PVP_MODE::PvpDuel;
 		}
 	}
+	// in Safe zone
+	{
+		if (CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+		{
+			pvpMode |= PVP_MODE::PvpZoneSafe;
+			if (user->getSafeInPvPSafeZone())
+				pvpMode |= PVP_MODE::PvpSafe;
+		}
+	}
+
 	// pvp session (i.e everything else)
 	{
 		if ( user->getPVPInterface().isValid() )
@@ -596,9 +641,15 @@ void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 			pvpMode |= interf.getPVPSession()->getPVPMode();
 		}
 	}
-	
+
 	CMirrorPropValue<TYPE_PVP_MODE> propPvpMode( TheDataset, user->getEntityRowId(), DSPropertyPVP_MODE );
-	propPvpMode = pvpMode;
+	CMirrorPropValue<TYPE_EVENT_FACTION_ID> propPvpMode2( TheDataset, user->getEntityRowId(), DSPropertyEVENT_FACTION_ID );
+	if (propPvpMode.getValue() != pvpMode)
+	{
+		nlinfo("New pvp Mode : %d", pvpMode);
+		propPvpMode = pvpMode;
+		propPvpMode2 = pvpMode;
+	}
 }
 
 //----------------------------------------------------------------------------
@@ -648,22 +699,16 @@ PVP_RELATION::TPVPRelation CPVPManager2::getPVPRelation( CCharacter * actor, CEn
 	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
 	if( pTarget )
 	{
-		// priviledgePVP is Full PVP, only ally of teammates anf guildmates
-		if (pTarget->priviledgePVP() || actor->priviledgePVP())
+		// Full PVP is ennemy of everybody
+		if (pTarget->getFullPVP() || actor->getFullPVP())
 		{
-			if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
-				return PVP_RELATION::Ally;
-		
-			if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()))
-				return PVP_RELATION::Ally;
-
 			return PVP_RELATION::Ennemy;
 		}
 
 		if( IsRingShard )
 			return relation; // disable PVP on Ring shards (only if target is a CCharacter, because we must let attack NPCs)
 
-		// //////////////////////////////////////////////////////
+		////////////////////////////////////////////////////////
 		// temp : until new manager is finished we have to check the char pvp session too
 		IPVP * pvpSession = pTarget->getPVPInterface().getPVPSession();
 		if( pvpSession )
@@ -713,8 +758,8 @@ PVP_RELATION::TPVPRelation CPVPManager2::getPVPRelation( CCharacter * actor, CEn
 		if( relationTmp == PVP_RELATION::NeutralPVP )
 			relation = PVP_RELATION::NeutralPVP;
 
-		// Check if ally (neutralpvp has priority over ally)
-		if( relationTmp == PVP_RELATION::Ally && relation != PVP_RELATION::NeutralPVP )
+		// Check if ally (neutralpvp and active has priority over ally)
+		if (relationTmp == PVP_RELATION::Ally && relation != PVP_RELATION::NeutralPVP)
 			relation = PVP_RELATION::Ally;
 	}
 
@@ -730,6 +775,7 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 
 	PVP_RELATION::TPVPRelation pvpRelation = getPVPRelation( actor, target, true );
 	bool actionValid;
+	nlinfo("Pvp relation = %d", pvpRelation);
 	switch( pvpRelation )
 	{
 		case PVP_RELATION::Ally :
@@ -757,11 +803,12 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 	if( actionValid && !checkMode )
 	{
 		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
-		if(pTarget)
-			actor->clearSafeInPvPSafeZone();
+	
+		//if(pTarget)
+		//	actor->clearSafeInPvPSafeZone();
 
 		// propagate faction pvp flag
-		if( pvpRelation == PVP_RELATION::Ally )
+		if( pvpRelation == PVP_RELATION::Ally)
 		{
 			if( _PVPFactionAllyReminder )
 			{
@@ -782,10 +829,6 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 			{
 				actor->refreshOutpostLeavingTimer();
 			}
-		
-			// propagate full pvp
-			if( pTarget->priviledgePVP() )
-				actor->setPriviledgePVP(true);
 		}
 	}
 	return actionValid;
@@ -832,7 +875,13 @@ bool CPVPManager2::isOffensiveActionValid( CCharacter * actor, CEntityBase * tar
 	{
 		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
 		if(pTarget)
-			actor->clearSafeInPvPSafeZone();
+		{
+			if (actor->getDuelOpponent() == pTarget) // No _PVPFactionEnemyReminder when in duel
+				CPVPManager2::getInstance()->setPVPFactionAllyReminder(false);
+			else
+				actor->clearSafeInPvPSafeZone();
+		}
+
 		if( _PVPFactionEnemyReminder )
 		{
 			actor->setPVPRecentActionFlag();
@@ -886,10 +935,20 @@ bool CPVPManager2::canApplyAreaEffect(CCharacter* actor, CEntityBase * areaTarge
 	
 	if( actionValid )
 	{
+		/*	if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() != pTarget->getGuildId()))
+				return false;
+		*/
+
 		if( areaTarget->getId().getType() == RYZOMID::player )
 		{
 			CCharacter * pTarget = dynamic_cast<CCharacter*>(areaTarget);
-			if(pTarget)
+			if (!offensive)
+			{
+				if (actor->getTeamId() != pTarget->getTeamId() && actor->getLeagueId() != pTarget->getLeagueId() )
+					return false;
+			}
+
+			if(pTarget && offensive)
 				actor->clearSafeInPvPSafeZone();
 			// set faction flag
 			if( offensive && _PVPFactionEnemyReminder )
@@ -1096,6 +1155,11 @@ void CPVPManager2::createExtraFactionChannel(const std::string & channelName)
 
 TChanID CPVPManager2::createUserChannel(const std::string & channelName, const std::string & pass)
 {
+	// Don't allow channels called "GM" (to not clash with the /who gm command)
+	if (NLMISC::nlstricmp( channelName.c_str() , "GM" ) == 0)
+	{
+		return DYN_CHAT_INVALID_CHAN;
+	}
 
 	TMAPExtraFactionChannel::iterator it = _UserChannel.find(channelName);
 	if( it == _UserChannel.end() )
@@ -1244,6 +1308,14 @@ void CPVPManager2::askForDuel( const NLMISC::CEntityId & userId )
 		return;
 	}
 
+	// If not a privileged player and in ignorelist, cannot duel
+	if ( !user->haveAnyPrivilege() && target->hasInIgnoreList( user->getId() ) )
+	{
+		params[0].setEIdAIAlias( target->getId(), CAIAliasTranslator::getInstance()->getAIAlias(target->getId()) );
+		CCharacter::sendDynamicSystemMessage(userId, "DUEL_REFUSE_INVITATION", params);
+		return;
+	}
+
 	// remove previous invitation, and check that user is not invited
 	bool problem = false;
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
index a5f33ade8..aed6861b1 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
@@ -76,10 +76,12 @@ public:
 	void onIOSMirrorUp();
 	/// callback called at each tick
 	void tickUpdate();
-	/// return dynamic channel TChanID attribued to a faction
+	/// return dynamic channel TChanID attributed to a faction
 	TChanID getFactionDynChannel( const std::string& channelName );
-	/// return dynamic channel TChanID attribued to an user
+	/// return user dynamic channel TChanID
 	TChanID getUserDynChannel( const std::string& channelName);
+	/// return user dynamic channel name
+	std::string getUserDynChannel(const TChanID& channelId);
 	/// return dynamic channel TChanID attribued to a faction
 	const std::string &getPassUserChannel( TChanID channelId);
 	/// return dynamic channel TChanID character must have, DYN_CHAT_INVALID_CHAN if he must don't have faction channel
@@ -91,7 +93,7 @@ public:
 	// brodcast message to channel
 	void broadcastMessage(TChanID channel, const ucstring& speakerName ,const ucstring& txt);
 	// send list of users to player
-	void sendChannelUsers(TChanID channel, CCharacter * user);
+	void sendChannelUsers(TChanID channel, CCharacter * user, bool outputToSys = false);
 	// add faction channel to character if needed
 	void addFactionChannelToCharacter(TChanID channel, CCharacter * user, bool writeRight = true, bool userChannel = false);
 	// remove faction channel for character
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
index 7badb3347..97bbbfe92 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
@@ -63,6 +63,15 @@ namespace PVP_ZONE_TYPE
 } // namespace PVP_ZONE_TYPE
 
 
+//----------------------------------------------------------------------------
+static inline bool inSameLeague(CCharacter * c1, CCharacter * c2)
+{
+	if (c1 == NULL || c2 == NULL)
+		return false;
+
+	return ( c1 == c2 ) || ( c1->getLeagueId() != DYN_CHAT_INVALID_CHAN && c1->getLeagueId() == c2->getLeagueId() );
+}
+
 //----------------------------------------------------------------------------
 static inline bool inSameTeam(CCharacter * c1, CCharacter * c2)
 {
@@ -372,35 +381,47 @@ PVP_RELATION::TPVPRelation CPVPFreeZone::getPVPRelation( CCharacter * user, CEnt
 	nlassert(user);
 	nlassert(target);
 
-	if( target->getId().getType() != RYZOMID::player )
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
+	if (target->getId().getType() != RYZOMID::player)
 	{
 		return PVP_RELATION::Unknown;
 	}
 
-	// if target is in same zone then he's an ennemy or ally 
-	if ( _Users.find( target->getEntityRowId() ) != _Users.end() )
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
 	{
-		if( inSameTeam( user, (CCharacter *)target ) )
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
+	}
+
+	if (CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	// In same Zone
+	if (_Users.find( target->getEntityRowId() ) != _Users.end())
+	{
+		// In Same Team or League => Ally
+		if (inSameTeam( user, pTarget ) || inSameLeague( user, pTarget ))
 		{
 			return PVP_RELATION::Ally;
 		}
-		else
-		{
+
+		// If both not in safe zone => Ennemy
+		if (!targetSafe && !actorSafe)
 			return PVP_RELATION::Ennemy;
-		}
 	}
 
-	// if target is in free pvp then he's neutral pvp
-	const CCharacter * targetChar = static_cast<const CCharacter*>(target);
-	if( targetChar->getPVPInterface().isValid() )
-	{
-		if( targetChar->getPVPInterface().getPVPSession()->getPVPMode() == PVP_MODE::PvpZoneFree );
-		{
-			return PVP_RELATION::NeutralPVP;
-		}
-	}
-	
-	return PVP_RELATION::Neutral;
+	return PVP_RELATION::NeutralPVP;
 }
 
 //----------------------------------------------------------------------------
@@ -1135,36 +1156,53 @@ PVP_RELATION::TPVPRelation CPVPGuildZone::getPVPRelation( CCharacter * user, CEn
 	nlassert(user);
 	nlassert(target);
 
-	// target has to be a char
-	CCharacter *targetChar = dynamic_cast<CCharacter*>(target);
-	if ( !targetChar )
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
+	if( target->getId().getType() != RYZOMID::player )
 	{
 		return PVP_RELATION::Unknown;
 	}
-	
-	// check that target is in the same zone than user (discards bots)
+
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
+	{
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
+	}
+
+	if( CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	// if target is in same zone then he's an ennemy or ally 
 	if ( _Users.find( target->getEntityRowId() ) != _Users.end() )
 	{
-		if ( inSameGuild(targetChar,user) || inSameTeam( targetChar, user) )
+		// In Same Team or League => Ally
+		if (inSameTeam( user, pTarget ) || inSameLeague( user, pTarget ))
 		{
 			return PVP_RELATION::Ally;
 		}
-		else
+		
+		// in same Guild and not in Leagues => Ally 
+		if (inSameGuild( user, pTarget ) && user->getLeagueId() == DYN_CHAT_INVALID_CHAN && pTarget->getLeagueId() == DYN_CHAT_INVALID_CHAN)
 		{
-			return PVP_RELATION::Ennemy;
-		}			
-	}
-	
-	// if target is in guild pvp then he's neutral pvp
-	if( targetChar->getPVPInterface().isValid() )
-	{
-		if( targetChar->getPVPInterface().getPVPSession()->getPVPMode() == PVP_MODE::PvpZoneGuild )
-		{
-			return PVP_RELATION::NeutralPVP;		
+			return PVP_RELATION::Ally;
 		}
+
+		// If both not in safe zone => Ennemy
+		if (!targetSafe && !actorSafe)
+			return PVP_RELATION::Ennemy;
 	}
-	
-	return PVP_RELATION::Neutral;
+
+	return PVP_RELATION::NeutralPVP;
 }
 	
 /*
diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
index f44e8dd84..76c05a7b3 100644
--- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
+++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
@@ -155,6 +155,12 @@ void CTradeBase::copy( IItemTrade * itt )
 	else _ItemPtr = 0;
 }
 
+TGameCycle CItemForSale::getGameCycleLeft() const
+{
+	TGameCycle dt = CTickEventHandler::getGameCycle() - _StartSaleCycle;
+	return (TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - (sint32)( dt + _ItemPtr->getTotalSaleCycle() ) ) ) );
+}
+
 //-----------------------------------------------------------------------------
 //uint32 CTradeBase::getFactionPointPrice() const
 //{
diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
index f473b356a..fac7fa505 100644
--- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
+++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
@@ -202,7 +202,8 @@ public:
 	void setAvailable( bool a );
 
 	// return game cycle left for item in store 
-	NLMISC::TGameCycle getGameCycleLeft() const {	return (NLMISC::TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - ( ( CTickEventHandler::getGameCycle() - _StartSaleCycle ) + _ItemPtr->getTotalSaleCycle() ) ) ) ); }
+//	NLMISC::TGameCycle getGameCycleLeft() const {	return (NLMISC::TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - ( ( CTickEventHandler::getGameCycle() - _StartSaleCycle ) + _ItemPtr->getTotalSaleCycle() ) ) ) ); }
+	NLMISC::TGameCycle getGameCycleLeft() const;
 	
 	// get quantity
 	uint32 getQuantity() const { return _Quantity; }
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team.cpp b/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
index 904cb7327..a18f81d67 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
@@ -57,6 +57,7 @@ void CTeam::init( CCharacter*  leader, uint16 teamId )
 	_ValidityFlags.Fake = false;
 	_NbMembers = 1;
 	_TeamId  = teamId;
+	_LeagueId = leader->getLeagueId();
 	_LeaderId = leader->getId();
 	_TeamMembers.push_back(_LeaderId);
 	// init the team chat group
@@ -120,6 +121,12 @@ void CTeam::release()
 	PROGRESSIONPVE::CCharacterProgressionPVE::getInstance()->disbandTeam(_TeamId, _TeamMembers);
 	PROGRESSIONPVP::CCharacterProgressionPVP::getInstance()->disbandTeam(_TeamId, _TeamMembers);
 
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+	{
+		DynChatEGS.removeChan(_LeagueId);
+	}
+
+	_LeagueId = DYN_CHAT_INVALID_CHAN;
 	_TeamId = CTEAM::InvalidTeamId;
 	_TeamMembers.clear();
 	_NbMembers = 0;
@@ -167,7 +174,8 @@ void CTeam::addCharacter(CCharacter *newCharacter)
 	else
 	{
 //		newCharacter->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", 1  );
-		CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(newCharacter->_PropertyDatabase, 1);
+		uint8 index = getSuccessorIndex();
+		CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(newCharacter->_PropertyDatabase, index);
 	}
 	
 	// update all member's DB
@@ -283,6 +291,9 @@ void CTeam::addCharacter(CCharacter *newCharacter)
 	// set the character team
 	newCharacter->setTeamId(_TeamId);
 
+	// set the character alliance
+	newCharacter->setLeagueId(_LeagueId);
+
 	// Add character to chat group
 	TGroupId idGroupe = CHAT_GROUPS_IDS::getTeamChatGroupId(_TeamId);
 	CMessage msgout("ADD_TO_GROUP");
@@ -383,6 +394,7 @@ void CTeam::removeCharacter( CCharacter * player )
 
 	///\todo give him a player team Id
 	player->setTeamId( CTEAM::InvalidTeamId );
+	player->setLeagueId(DYN_CHAT_INVALID_CHAN);
 	player->updateTargetingChars();
 
 	// tell progression system this player has been removed from his team
@@ -410,13 +422,19 @@ void CTeam::removeCharacter( CCharacter * player )
 		clearPlayerTeamDB( *_TeamMembers.begin() );
 		CCharacter * lastPlayer = PlayerManager.getOnlineChar( *_TeamMembers.begin() );
 		if ( lastPlayer )
+		{
 			lastPlayer->setTeamId( CTEAM::InvalidTeamId );
+			lastPlayer->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		}
 		else
 		{
 			nlwarning("<CTeam removeCharacter> charId %s not found in the team", (*_TeamMembers.begin()).toString().c_str() );
 			return;
 		}
 
+		// remove league
+		setLeague("");
+
 		// remove the team chat group
 		TGroupId idGroupe = CHAT_GROUPS_IDS::getTeamChatGroupId(_TeamId);
 		CMessage msgRemoveGroup("REMOVE_GROUP");
@@ -437,80 +455,26 @@ void CTeam::removeCharacter( CCharacter * player )
 	// if that was the leader, get another one
 	else if ( _LeaderId == charId )
 	{
-		_LeaderId = _SuccessorId;
-		_SuccessorId = CEntityId::Unknown;
-		for (list<CEntityId>::const_iterator it = _TeamMembers.begin(); it != _TeamMembers.end(); ++it)
-		{
-			if ( (*it) != _LeaderId )
-			{
-				_SuccessorId = (*it );
-				break;
-			}
-		}
-
-
-		// switch dyn chat speaker
-		CMissionManager::getInstance()->switchDynChatSpeaker(player,_LeaderId);
-
-		// inform the new leader
-		SM_STATIC_PARAMS_1(params1, STRING_MANAGER::player);		
-		params1[0].setEId( charId );
-		PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(_LeaderId), "TEAM_YOU_NEW_LEADER", params1);
-
-		// inform the group 
-		SM_STATIC_PARAMS_2(params, STRING_MANAGER::player, STRING_MANAGER::player);		
-		params[0].setEId( charId );
-		params[1].setEId( _LeaderId );
-
-		set<CEntityId> exclude;
-		exclude.insert( _LeaderId );
-		exclude.insert( charId );
-		sendDynamicMessageToMembers("TEAM_NEW_LEADER", params, exclude);
-
-		// update leader DB
-		CCharacter *leader = PlayerManager.getOnlineChar( _LeaderId );
-		if (leader)
-		{
-//			leader->_PropertyDatabase.setProp( "GROUP:LEADER_INDEX", -1 );
-			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(leader->_PropertyDatabase, 0xf);
-//			leader->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", 0 );
-			CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(leader->_PropertyDatabase, 0);
-		}
-		else
-			nlwarning("<CTeam removeCharacter> invalid new leader %s", _LeaderId.toString().c_str() );
+		setLeader(_SuccessorId);
 	}
-	// if that was the successor, inform the new one
-/*	else if ( formerPos == 1 && _NbMembers > 2)
-	{
-		list<CEntityId>::iterator itTmp = _TeamMembers.begin();
-		++itTmp;
-		const CEntityId & successorId = *(itTmp);
-		CCharacter *successor = PlayerManager.getOnlineChar( successorId );
-		if (successor)
-		{
-			successor->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", -1 );
-		}
-		else
-			nlwarning("<CTeam removeCharacter> invalid new successor %s", successorId.toString().c_str() );
-
-	}
-*/
 	else if ( _SuccessorId == charId )
 	{
-		for (list<CEntityId>::const_iterator it = _TeamMembers.begin(); it != _TeamMembers.end(); ++it)
+		// The current successor dropped from team; set it to the next in line after leader
+		setSuccessor(1);
+	}
+	else
+	{
+		// A random member dropped from team; make sure the current successor is shown currectly
+		// in all team lists.
+		uint8 index = 0;
+		for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
 		{
-			if ( (*it) != _LeaderId )
-			{
-				_SuccessorId = (*it );
-				CCharacter *successor = PlayerManager.getOnlineChar( _SuccessorId );
-				if (successor)
-				{
-//					successor->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", -1 );
-					CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(successor->_PropertyDatabase, 0xf);
-				}
+			if (_SuccessorId == (*it))
 				break;
-			}
+			++index;
 		}
+		// Don't show a message because the successor hasn't actually changed.
+		setSuccessor(index, false);
 	}
 
 	for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
@@ -607,9 +571,106 @@ void CTeam::removeCharacter( CCharacter * player )
 
 }// CTeam removeCharacter
 
-void CTeam::setSuccessor( uint8 memberIdx )
+void CTeam::setLeague(const string &leagueName)
+{
+	TChanID chanId = _LeagueId;
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+	{
+		// Remove players from previous channel
+		_LeagueId = DYN_CHAT_INVALID_CHAN;
+		updateLeague();
+		// Remove channel if empty
+		vector<CEntityId> players;
+		if (!DynChatEGS.getPlayersInChan(chanId, players))
+			DynChatEGS.removeChan(chanId);
+	}
+
+	if (!leagueName.empty())
+	{
+		_LeagueId = DynChatEGS.addChan("league_"+toString(DynChatEGS.getNextChanID()), leagueName);
+		if (_LeagueId == DYN_CHAT_INVALID_CHAN)
+		{
+			nlinfo("Error channel creation !!!");
+			return;
+		}
+		// set historic size of the newly created channel
+		DynChatEGS.setHistoricSize(_LeagueId, 100);
+	}
+	
+	updateLeague();
+}
+
+void CTeam::updateLeague()
+{
+	for (list<CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+	{
+		CCharacter * ch = PlayerManager.getOnlineChar((*it));
+		if (ch != NULL && ch->getLeagueId() != _LeagueId)
+		{
+			ch->setLeagueId(_LeagueId);
+		}
+	}
+}
+
+uint8 CTeam::getSuccessorIndex()
+{
+	list<CEntityId>::const_iterator it = _TeamMembers.begin();
+	uint8 i = 0;
+	for (; it != _TeamMembers.end(); ++it)
+	{
+		if ( (*it) == _SuccessorId )
+			break;
+		++i;
+	}
+	return i;
+}
+
+void CTeam::setLeader(CEntityId id, bool bMessage)
+{
+	_LeaderId = id;
+
+	// Move new leader to top of list
+	_TeamMembers.remove(_LeaderId);
+	_TeamMembers.insert(_TeamMembers.begin(), _LeaderId);
+
+	// inform the new leader
+	SM_STATIC_PARAMS_1(params1, STRING_MANAGER::player);		
+	params1[0].setEId( id );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(_LeaderId), "TEAM_YOU_NEW_LEADER", params1);
+
+	// inform the group 
+	SM_STATIC_PARAMS_2(params, STRING_MANAGER::player, STRING_MANAGER::player);		
+	params[0].setEId( id );
+	params[1].setEId( _LeaderId );
+
+	set<CEntityId> exclude;
+	exclude.insert( _LeaderId );
+	exclude.insert( id );
+	sendDynamicMessageToMembers("TEAM_NEW_LEADER", params, exclude);
+
+	// New leader was successor, choose a new successor
+	if (id == _SuccessorId)
+	{
+		_SuccessorId = CEntityId::Unknown;
+		// Set the new successor to next in line
+		setSuccessor(1);
+	}
+
+	// update leader DB
+	CCharacter *leader = PlayerManager.getOnlineChar( _LeaderId );
+	if (leader)
+	{
+		// switch dyn chat speaker
+		CMissionManager::getInstance()->switchDynChatSpeaker(leader, _LeaderId);
+
+		CBankAccessor_PLR::getGROUP().setLEADER_INDEX(leader->_PropertyDatabase, 0xf);
+	}
+	else
+		nlwarning("<CTeam setLeader> invalid new leader %s", _LeaderId.toString().c_str() );
+}
+
+void CTeam::setLeader(uint8 memberIdx, bool bMessage)
 {
-	/*
 	list<CEntityId>::const_iterator it = _TeamMembers.begin();
 	uint8 i = 0;
 	for (; it != _TeamMembers.end(); ++it)
@@ -623,98 +684,58 @@ void CTeam::setSuccessor( uint8 memberIdx )
 		nlwarning("invalid team member %u : count is %u", memberIdx,_TeamMembers.size() );
 		return;
 	}
-	_SuccessorId = (*it);
-	SM_STATIC_PARAMS_1( params,STRING_MANAGER::player );
-	params[0].EId = (*it );
-	sendDynamicMessageToMembers("TEAM_NEW_SUCCESSOR",params);
+	CEntityId newLeaderId = (*it);
+	setLeader(newLeaderId, bMessage);
+}
 
-	for (std::list<CEntityId>::const_iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+void CTeam::setSuccessor( uint8 memberIdx, bool bMessage)
+{
+	list<CEntityId>::const_iterator it = _TeamMembers.begin();
+	uint8 i = 0;
+	for (; it != _TeamMembers.end(); ++it)
 	{
-		uint8 hp, sap, stamina;
-		uint32 nameId;
-		CCharacter* character = PlayerManager.getOnlineChar( (*it) );
-		if (character != NULL)
-		{
-			// update the current character team slot
-///\todo: can be done outside the loop
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
-				hp = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
-			else
-				hp = 0;
-
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
-				sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
-			else
-				sap = 0;
-
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
-				stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
-			else
-				stamina = 0;
-
-			CMirrorPropValueRO<uint32> nameIndexValue1( TheDataset, newCharacter->getId(), "NameIndex" );
-			nameId = nameIndexValue1();
-				
-			sprintf(buffer, "GROUP:%d:HP",position );
-			character->_PropertyDatabase.setProp( buffer, hp );
-
-			sprintf(buffer, "GROUP:%d:SAP",position );
-			character->_PropertyDatabase.setProp( buffer, sap );
-
-			sprintf(buffer, "GROUP:%d:STA",position );
-			character->_PropertyDatabase.setProp( buffer, stamina );
-
-			sprintf(buffer, "GROUP:%d:NAME",position );
-			character->_PropertyDatabase.setProp( buffer, nameId );
-
-			sprintf(buffer, "GROUP:%d:UID",position );
-			character->_PropertyDatabase.setProp( buffer, newCharacter->getEntityRowId().getCompressedIndex() );
-
-			sprintf(buffer, "GROUP:%d:PRESENT",position );
-			character->_PropertyDatabase.setProp( buffer, (uint8)1 );
-
-			// update the new character team slot corresponding to character
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
-				hp = (uint8)  ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
-			else
-				hp = 0;
-				
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
-				sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
-			else
-				sap = 0;
-
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
-				stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
-			else
-				stamina = 0;
-
-			CMirrorPropValueRO<uint32> nameIndexValue2( TheDataset, character->getId(), "NameIndex" );
-			nameId = nameIndexValue2();
-
-			sprintf(buffer, "GROUP:%d:HP",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, hp );
-				
-			sprintf(buffer, "GROUP:%d:SAP",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, sap );
-
-			sprintf(buffer, "GROUP:%d:STA",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, stamina );
-
-			sprintf(buffer, "GROUP:%d:NAME",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, nameId );
-
-			sprintf(buffer, "GROUP:%d:UID",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, character->getEntityRowId().getCompressedIndex() );
-
-			sprintf(buffer, "GROUP:%d:PRESENT",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, (uint8)1 );
-		}
-		else
-			nlwarning("<CTeam::addCharacter> Unknown character %s", (*it).toString().c_str() );
+		if ( i == memberIdx )
+			break;
 		++i;
 	}
-	*/
+	if ( it == _TeamMembers.end() )
+	{
+		nlwarning("invalid team member %u : count is %u", memberIdx,_TeamMembers.size() );
+		return;
+	}
+
+	_SuccessorId = (*it);
+	i = 0;
+	for (it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+	{
+		CCharacter * ch = PlayerManager.getOnlineChar( (*it) );
+		if (ch)
+		{
+			// If this char is the successor, don't show
+			if (i == memberIdx)
+			{
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, 0xf);
+			}
+			else if (i < memberIdx)
+			{
+				// If the successor comes after this player in the list,
+				// bump it up one.
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, memberIdx - 1);
+			}
+			else
+			{
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, memberIdx);
+			}
+		}
+		++i;
+	}
+
+	if (bMessage)
+	{
+		SM_STATIC_PARAMS_1( params,STRING_MANAGER::player );
+		params[0].setEIdAIAlias(_SuccessorId, CAIAliasTranslator::getInstance()->getAIAlias(_SuccessorId));
+		sendDynamicMessageToMembers("TEAM_NEW_SUCCESSOR", params);
+	}
 }
 
 //---------------------------------------------------
@@ -1130,22 +1151,65 @@ CMissionTeam* CTeam::getMissionByAlias( TAIAlias missionAlias )
 	return NULL;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+void CTeam::updateMembersDb()
+{
+	for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+	{
+		uint8 hp, sap, stamina;
+		uint32 nameId;
+		uint pos = 0;
+
+		CCharacter * ch1 = PlayerManager.getOnlineChar( (*it) );
+
+		if (ch1->getId() == _LeaderId)
+		{
+			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(ch1->_PropertyDatabase, 0xf);
+		}
+		else 
+		{
+			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(ch1->_PropertyDatabase, 0);
+		}
+		///\todo log if nothing
+		if (ch1)
+		{
+			for (std::list<NLMISC::CEntityId>::iterator it2 = _TeamMembers.begin() ; it2 != _TeamMembers.end() ; ++it2)
+			{
+				if ( (*it) == (*it2) )
+					continue;	
+
+				CBankAccessor_PLR::TGROUP::TArray &groupItem = CBankAccessor_PLR::getGROUP().getArray(pos);
+
+				CCharacter * ch2 = PlayerManager.getOnlineChar( (*it2) );	
+				if (ch2 != NULL)
+				{
+					// update new char for old char
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
+						hp = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
+					else
+						hp = 0;
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
+						sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
+					else
+						sap = 0;
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
+						stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
+					else
+						stamina = 0;
+					
+					CMirrorPropValueRO<uint32> nameIndexValue( TheDataset, ch2->getId(), "NameIndex" );
+					nameId = nameIndexValue();
+									
+					groupItem.setHP(ch1->_PropertyDatabase, hp);
+					groupItem.setSAP(ch1->_PropertyDatabase, sap);
+					groupItem.setSTA(ch1->_PropertyDatabase, stamina);
+					groupItem.setNAME(ch1->_PropertyDatabase, nameId);
+					groupItem.setUID(ch1->_PropertyDatabase, ch2->getEntityRowId().getCompressedIndex());
+					groupItem.setPRESENT(ch1->_PropertyDatabase, true);
+				}
+				pos++;
+			}
+		}
+	}
+}
 
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team.h b/code/ryzom/server/src/entities_game_service/team_manager/team.h
index f4a9cdb20..6ab59f6ce 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team.h
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team.h
@@ -23,6 +23,7 @@
 #include "game_share/misc_const.h"
 #include "game_share/string_manager_sender.h"
 #include "game_share/scores.h"
+#include "game_share/dyn_chat.h"
 #include "mission_manager/mission_event.h"
 #include "mission_manager/ai_alias_translator.h"
 #include "team_manager/reward_sharing.h"
@@ -73,17 +74,54 @@ public:
 	void removeCharacter( CCharacter * newChar );
 
 	/**
-	 * set the successor of the team leader
-	 * \param memberIdx is the index of the member in hte team
+	 * return the index of team leader successor
+	 * 
 	 */
-	void setSuccessor( uint8 memberIdx );
+	uint8 getSuccessorIndex(void);
+
+	/**
+	 * set the League
+	 * \param leagueName is the name of League
+	 */
+	void setLeague(const std::string &leagueName);
+	/**
+	 * update the League (set LeagueId to all teammates)
+	 */
+	void updateLeague();
 	
+	/**
+	 * set the team leader
+	 * \param id is the Entity ID of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setLeader(NLMISC::CEntityId id, bool bMessage = true);
+	
+	/**
+	 * set the team leader
+	 * \param memberIdx is the index of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setLeader(uint8 memberIdx, bool bMessage = true);
+
+	/**
+	 * set the successor of the team leader
+	 * \param memberIdx is the index of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setSuccessor( uint8 memberIdx, bool bMessage = true );
+
 	/**
 	 * get the leader of the team
 	 * \return team leader Id
 	 */
 	inline const NLMISC::CEntityId & getLeader() const { return _LeaderId; }
 
+	/**
+	 * get the successor of the team
+	 * \return successor Id
+	 */
+	inline const NLMISC::CEntityId & getSuccessor() const { return _SuccessorId; }
+
 	///\return number of team members
 	inline uint8 getTeamSize() const { return _NbMembers; }
 
@@ -108,6 +146,12 @@ public:
 	///\return the team id
 	inline uint16 getTeamId() const { return _TeamId; }
 
+	///\return the League id
+	inline TChanID getLeagueId() const { return _LeagueId; }
+
+	///\return the League id
+	inline void setLeagueId(TChanID id) { _LeagueId = id; }
+
 	/// send a message to the team
 	void sendDynamicMessageToMembers(const std::string &msgName, const TVectorParamCheck &params, const std::set<NLMISC::CEntityId> &excluded) const;
 	inline void sendDynamicMessageToMembers(const std::string &msgName, const TVectorParamCheck &params) const
@@ -171,7 +215,8 @@ public:
 
 	CMissionTeam* getMissionByAlias( TAIAlias missionAlias );
 	
-		/*
+	void updateMembersDb();
+/*
 	bool processMissionStepEvent(std::list< const CMissionEvent* > & eventList, uint missionIndex, uint32 stepIndex );
 	bool processMissionEvent( std::list< const CMissionEvent* > & eventList, uint missionIndex, uint32 stepIndex );
 */
@@ -204,6 +249,9 @@ private:
 	///\id of the team
 	uint16								_TeamId;
 	
+	///\id of the League (it's id of channel)
+	TChanID							_LeagueId;
+
 	/// Team Members. The index of an entity in the container is its position
 	std::list<NLMISC::CEntityId>		_TeamMembers;
 
@@ -212,6 +260,7 @@ private:
 
 	/// id of the team leader
 	NLMISC::CEntityId					_LeaderId;
+
 	/// successor id
 	NLMISC::CEntityId					_SuccessorId;
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
index 9f7aef68e..dad058400 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
@@ -71,6 +71,195 @@ void CTeamManager::addAllTeamsToChatGroup()
 	}
 } // addAllTeamsToChatGroup //
 
+//---------------------------------------------------
+// leagueJoinProposal :
+//---------------------------------------------------
+void CTeamManager::joinLeagueProposal( CCharacter * leader, const CEntityId &targetId)
+{
+	//check already done
+	nlassert(leader);
+
+	const NLMISC::CEntityId &leaderId = leader->getId();
+	if (targetId == leaderId )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
+		return;
+	}
+
+	// get targeted player
+	CCharacter *invitedPlayer = PlayerManager.getOnlineChar( targetId );
+	if ( invitedPlayer == NULL )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
+		return;
+	}
+	
+	// god player are forbidden to team
+	if (leader->godMode() || invitedPlayer->godMode())
+	{
+		nlwarning("<CTeamManager joinLeagueProposal> Player %s invited %s, but at least on of them is god, forbidden", 
+			leaderId.toString().c_str(),
+			targetId.toString().c_str());
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_GOD_FORBIDDEN" );
+		return;
+	}
+
+	TInviteRetCode code = isLeagueInvitableBy(invitedPlayer,leader);
+	if ( code == AlreadyInvited )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_ALREADY_INVITED" );
+		return;
+	}
+	else if ( code == AlreadyInLeague )
+	{
+		CTeam * team = getRealTeam( invitedPlayer->getTeamId() );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_ALREADY_IN_LEAGUE" );
+		return;
+	}
+	else if ( code == NotLeader )
+	{
+		CTeam * team = getRealTeam( invitedPlayer->getTeamId() );
+		joinLeagueProposal(leader, team->getLeader());
+		return;
+	}
+	else if ( code == CantInvite )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return;
+	}
+
+	/// the invitor must not be in the ignore list of the target
+	if(invitedPlayer->hasInIgnoreList(leaderId))
+	{
+		SM_STATIC_PARAMS_1( params1, STRING_MANAGER::player );
+		params1[0].setEIdAIAlias( targetId, CAIAliasTranslator::getInstance()->getAIAlias( targetId) );
+		// Use the standard "player declines your offer". Don't use specific message because
+		// maybe not a good idea to inform a player that someone ignores him
+		CCharacter::sendDynamicSystemMessage( leaderId, "TEAM_DECLINE", params1 );
+		return;
+	}
+
+	//set the target's invitor
+	invitedPlayer->setLeagueInvitor(leaderId);
+
+	CEntityId msgTargetEId = targetId;
+	
+	//send the appropriate string to the client
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::player);
+	params[0].setEIdAIAlias( leaderId, CAIAliasTranslator::getInstance()->getAIAlias(leaderId) );
+	uint32 txt = STRING_MANAGER::sendStringToClient(TheDataset.getDataSetRow(targetId), "LEAGUE_PROPOSAL", params );
+	
+	CMessage msgout( "IMPULSION_ID" );
+	msgout.serial( const_cast<CEntityId&>(msgTargetEId) );
+	CBitMemStream bms;
+	nlverify ( GenericMsgManager.pushNameToStream( "PVP_CHALLENGE:INVITATION", bms) );
+	bms.serial( txt );
+	msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
+	sendMessageViaMirror( NLNET::TServiceId(msgTargetEId.getDynamicId()), msgout );
+
+	params[0].setEIdAIAlias( targetId, CAIAliasTranslator::getInstance()->getAIAlias( targetId ) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(leader->getEntityRowId(), "LEAGUE_INVITE", params);
+	
+	leader->updateTarget();	
+}
+
+//---------------------------------------------------
+// joinLeagueDecline :
+//---------------------------------------------------
+void CTeamManager::joinLeagueDecline( const NLMISC::CEntityId &charId)
+{
+	CCharacter * invited = PlayerManager.getOnlineChar(charId);
+	if ( invited == NULL )
+	{
+		nlwarning("<CTeamManager joinLeagueDecline>Invalid char %s",charId.toString().c_str());
+		return;
+	}
+	invited->setAfkState(false);
+	if ( invited->getLeagueInvitor() == CEntityId::Unknown )
+	{
+		nlwarning("<CTeamManager joinLeagueDecline>character %s has an Invalid invitor",charId.toString().c_str());
+		return;
+	}
+
+	//inform both players
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::player);	
+	params[0].setEIdAIAlias( charId, CAIAliasTranslator::getInstance()->getAIAlias( charId) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(invited->getTeamInvitor()), "LEAGUE_DECLINE", params);
+	
+	params[0].setEIdAIAlias( invited->getTeamInvitor(), CAIAliasTranslator::getInstance()->getAIAlias( invited->getTeamInvitor() ) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(invited->getEntityRowId(), "LEAGUE_YOU_DECLINE", params);
+
+	//cancel the proposal
+	invited->setLeagueInvitor( CEntityId::Unknown );
+} // joinLeagueDecline //
+
+//---------------------------------------------------
+// joinLeagueAccept :
+//---------------------------------------------------
+void CTeamManager::joinLeagueAccept( const NLMISC::CEntityId &charId)
+{
+	// get the invited char
+	CCharacter * invited = PlayerManager.getOnlineChar(charId);
+	if ( invited == NULL )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>Invalid char %s",charId.toString().c_str());
+		return;
+	}
+
+	// get the invitor id
+	const NLMISC::CEntityId & invitorId = invited->getLeagueInvitor();
+
+	if ( invitorId == CEntityId::Unknown )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s has an Invalid invitor",charId.toString().c_str());
+		return;
+	}
+	//get the invitor char
+	CCharacter * invitor = PlayerManager.getOnlineChar(invitorId);
+	if ( invitor == NULL  )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s, Invalid invitor id %s",charId.toString().c_str(),invitorId.toString().c_str());
+		invited->setLeagueInvitor( CEntityId::Unknown );
+		return;
+	}
+	invitor->setAfkState(false);
+	
+	//cancel the proposal
+	invited->setLeagueInvitor( CEntityId::Unknown );
+
+	CTeam *teamInvitor;
+	CTeam *teamInvited;
+	//if the invited player had a fake team, remove it
+	teamInvited = getRealTeam(invited->getTeamId());
+	teamInvitor = getRealTeam(invitor->getTeamId());
+	
+	if ( !teamInvitor )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s, invitor id %s, the invited or invitor player is not in a valid team. ",charId.toString().c_str(),invitor->getId().toString().c_str() );
+		return;
+	}
+	
+	
+	// check that the invitor team have league else create them
+	if (teamInvitor->getLeagueId() == DYN_CHAT_INVALID_CHAN )
+	{
+		teamInvitor->setLeague("League");
+	}
+	
+	if (teamInvited) {
+		const string playerName = CEntityIdTranslator::getInstance()->getByEntity(invited->getId()).toString();
+		CPVPManager2::getInstance()->broadcastMessage(teamInvitor->getLeagueId(), string("<TEAM>"), "<-- "+playerName);
+		teamInvited->setLeagueId(teamInvitor->getLeagueId());
+		teamInvited->updateLeague();
+	} else {
+		const string playerName = CEntityIdTranslator::getInstance()->getByEntity(invited->getId()).toString();
+		CPVPManager2::getInstance()->broadcastMessage(teamInvitor->getLeagueId(), string("<PLAYER>"), "<-- "+playerName);
+		invited->setLeagueId(teamInvitor->getLeagueId(), true);
+	}
+	
+} // joinLeagueAccept //
+
+
 //---------------------------------------------------
 // joinProposal :
 //---------------------------------------------------
@@ -90,7 +279,7 @@ void CTeamManager::joinProposal( CCharacter * leader, const CEntityId &targetId)
 	CCharacter *invitedPlayer = PlayerManager.getOnlineChar( targetId );
 	if ( invitedPlayer == NULL )
 	{
-		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_TEAM_TARGET" );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
 		return;
 	}
 	
@@ -117,7 +306,7 @@ void CTeamManager::joinProposal( CCharacter * leader, const CEntityId &targetId)
 	}
 	else if ( code == CantInviteEnemy )
 	{
-		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_CANT_INVITE_ENEMIE" );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_CANT_INVITE_ENEMY" );
 		return;
 	}
 	else if ( code == CantInvite )
@@ -423,7 +612,7 @@ void CTeamManager::removeCharacter( const CEntityId &charId )
 		{
 			const list<CEntityId> &members = team->getTeamMembers();
 			
-			CEntityId eId(*(++members.begin()));
+			CEntityId eId(team->getSuccessor());
 			params[0].setEIdAIAlias( eId, CAIAliasTranslator::getInstance()->getAIAlias(eId) );
 			PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(charId), "TEAM_YOU_LEAVE_LEADER", params);
 		}
@@ -505,6 +694,48 @@ void CTeamManager::removeFakeTeam(CCharacter * player)
 		nlwarning("<CTeamManager removeFakeTeam> char %s the team id %d is out of bounds (nb teams = %d)",player->getId().toString().c_str(),player->getTeamId(),_Teams.size());
 }// removeFakeTeam
 
+//---------------------------------------------------
+// isLeagueInvitableBy :
+//---------------------------------------------------
+CTeamManager::TInviteRetCode CTeamManager::isLeagueInvitableBy(CCharacter * invited, CCharacter * invitor )
+{
+	// check must be done before
+	nlassert( invited );
+	nlassert( invitor );
+
+	if ( !TheDataset.isAccessible(invited->getEntityRowId()) || !TheDataset.isAccessible(invitor->getEntityRowId()))
+		return CantInvite;
+	
+	// check that the invitor is in team
+	CTeam * team = getRealTeam( invitor->getTeamId() );
+	if (!team)
+		return CantInvite;
+	
+	// check that the invitor is the leader
+	if (team->getLeader() != invitor->getId() )
+		return CantInvite;
+		
+	// check that the invited don't have league
+	if (invited->getLeagueId() !=  DYN_CHAT_INVALID_CHAN)
+		return AlreadyInLeague;
+	  
+	// check if target is not already invited
+	if( invited->getLeagueInvitor() != CEntityId::Unknown )
+		return AlreadyInvited;	
+
+	// get the target team
+	team = getRealTeam( invited->getTeamId() );
+	if (!team)
+		return NotInTeam;
+
+	// check that the invited is the leader
+	if (team->getLeader() != invited->getId() )
+		return NotLeader;
+
+	return Ok;
+}
+
+
 //---------------------------------------------------
 // processMissionTeamEvent :
 //---------------------------------------------------
@@ -519,6 +750,7 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 	{
 		return AlreadyInvited;
 	}
+
 	// get the target team, which must be fake
 	CTeam * team = getRealTeam( invited->getTeamId() );
 	if( team )
@@ -528,7 +760,8 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 	
 	// check that the invitor is alone or a group leader
 	team = getRealTeam( invitor->getTeamId() );
-	if ( team && team->getLeader()!= invitor->getId() )
+	
+	if (team && team->getLeader()!= invitor->getId())
 	{
 		return CantInvite;
 	}
@@ -538,9 +771,9 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 		return CantInvite;
 
 	// cannot invite enemy in faction PvP zones
-	if( CPVPManager2::getInstance()->isOffensiveActionValid( invited, invitor, true ) )
+/*	if( CPVPManager2::getInstance()->isOffensiveActionValid( invited, invitor, true ) )
 		if( invited->getPvPRecentActionFlag() || invitor->getPvPRecentActionFlag() )
-			return CantInviteEnemy;
+			return CantInviteEnemy;*/
 	return Ok;
 }
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
index af9a464f8..81a8a63d5 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
@@ -31,7 +31,7 @@ class CCharacter;
 
 ///\todo: avoid team reallocation problems?
 ///\todo: check if we have to remove team from IOS if crash/shutdown
-///\todo successor index sert à rien???
+///\todo successor index is useful ?
 
 /**
  * CTeamManager
@@ -47,9 +47,12 @@ public:
 	{
 		AlreadyInvited,
 		AlreadyInTeam,
+		AlreadyInLeague,
 		CantInviteEnemy,
 		CantInvite,
 		Ok,
+		NotInTeam,
+		NotLeader,
 	};
 	/// default constructor
 	CTeamManager()
@@ -58,6 +61,13 @@ public:
 	/// add all created to chat groups
 	void addAllTeamsToChatGroup();
 
+	/// player leaderId invites player targetId to join his League. Only leaders can invite other leaders
+	void joinLeagueProposal( CCharacter * leader, const NLMISC::CEntityId &targetId );
+	/// player charId declines an invitation
+	void joinLeagueDecline( const NLMISC::CEntityId &charId );
+	/// player charId accepts an invitation
+	void joinLeagueAccept( const NLMISC::CEntityId &charId );
+
 	/// player leaderId invites plyer targetId to join his team. Only leaders can invite
 	void joinProposal( CCharacter * leader, const NLMISC::CEntityId &targetId );
 
@@ -104,6 +114,13 @@ public:
 	 */
 	TInviteRetCode isInvitableBy(CCharacter * invited, CCharacter * invitor );
 
+	/**
+	 * \param invited: character being invited
+	 * \param invitor: character inviting the other one
+	 * \return true if the invited is invitable by the invitor
+	 */
+	TInviteRetCode isLeagueInvitableBy(CCharacter * invited, CCharacter * invitor );
+
 	/**
 	 * PvP attack occurs in a team
 	 * \param actor is the attacker character
diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
index 8dc1216d0..a50f7e67c 100644
--- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
+++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
@@ -11,9 +11,120 @@ LIST(REMOVE_ITEM SRC
 			${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
-			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp)
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/mfc/*)
 
-ADD_EXECUTABLE(ryzom_general_utilities_service ${SRC})
+
+
+SOURCE_GROUP("Documentation" FILES	ss_notes.txt 
+									ce_notes.txt 
+									ec_notes.txt 
+									ee_notes.txt 
+									em_notes.txt 
+									merge_notes.txt 
+									gus_module_notes.txt 
+									gus_net_notes.txt 
+									saves_notes.txt 
+									rs_notes.txt 
+									rsaves_notes.txt 
+									stats_notes.txt
+									server control module notes.txt)
+
+SOURCE_GROUP("GUS Modules\\Contest Control (CC)" FILES cc_commands.cpp  cc_contest_ctrl_script.cpp cc_contest_ctrl_script.h cc_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Contest Executor (CE)" FILES ce_commands.cpp ce_contest_executor.cpp ce_module_messages.h ce_contest_executor.h)
+
+SOURCE_GROUP("GUS Modules\\Contest Logger (CL)" FILES cl_contest_logger.cpp cl_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Event Chat (EC)" FILES	ec_channel.cpp 
+													ec_channel.h 
+													ec_ctrl_channel.cpp 
+													ec_ctrl_channel.h 
+													ec_event_chat.cpp 
+													ec_event_chat_module.cpp 
+													ec_event_chat_module.h 
+													ec_faction_channel.cpp 
+													ec_faction_channel.h
+													ec_party_channel.cpp
+													ec_party_channel.h
+													ec_types.h)
+
+SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES	ee_event_executor.cpp ee_event_executor.h ee_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES	em_commands.cpp em_event_manager.cpp em_event_manager.h em_module_messages.h)
+                             
+SOURCE_GROUP("GUS Modules\\Shard Merge (MERGE)" FILES	merge_commands.cpp merge_shard_merger.cpp)
+
+SOURCE_GROUP("GUS Modules\\Remote Saves (RSAVES)" FILES	remote_saves_interface.cpp remote_saves_interface.h rs_remote_saves.cpp rs_remote_saves.h rs_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Shard Saves (SAVES)" FILES	saves_module_messages.h saves_shard_saves.cpp saves_unit.cpp saves_unit.h)
+
+SOURCE_GROUP("GUS Modules\\Shard Script (SS)" FILES	ss_command_executor.cpp 
+													ss_command_executor.h 
+													ss_script_manager.cpp 
+													ss_commands.cpp 
+													ss_script_manager.h 
+													ss_service_comms_manager.cpp 
+													ss_service_comms_manager.h 
+													ss_state_manager.cpp 
+													ss_state_manager.h)
+                   
+				   
+SOURCE_GROUP("GUS Modules\\Stats Scan (STATS)" FILES	stats_guild_commands.cpp 
+														stats_guild_scan_job.cpp 
+														stats_guild_scan_job.h 
+														stat_character.cpp
+														stat_character.h
+														stat_character_scan_job.cpp 
+														stat_character_scan_job.h
+														stat_char_commands.cpp
+														stat_char_filter_factory.cpp
+														stat_char_filter_factory.h 
+														stat_char_info_extractor_factory.cpp
+														stat_char_info_extractor_factory.h 
+														stat_char_scan_script.cpp
+														stat_char_scan_script.h
+														stat_file_list_builder_factory.cpp 
+														stat_file_list_builder_factory.h 
+														stat_globals.cpp stat_globals.h 
+														stat_guild_container.cp 
+														stat_guild_container.h 
+														stat_job_manager.cpp 
+														stat_job_manager.h 
+														stat_user_char_filters.cpp 
+														stat_user_char_info_extractors.cpp 
+														stat_user_file_list_builders.cpp)
+
+SOURCE_GROUP("GUS Modules\\GUS Networking" FILES	gus_net.cpp 
+													gus_net.h 
+													gus_net_commands.cpp 
+													gus_net_connection.cpp 
+													gus_net_connection.h 
+													gus_net_hub.cpp 
+													gus_net_hub.h 
+													gus_net_implementation.cpp 
+													gus_net_implementation.h 
+													gus_net_messages.cpp 
+													gus_net_messages.h 
+													gus_net_remote_module.cpp 
+													gus_net_remote_module.h 
+													gus_net_types.h)
+
+SOURCE_GROUP("GUS Modules" FILES gus_module.cpp gus_module.h gus_module_commands.cpp gus_module_factory.cpp gus_module_factory.h gus_module_manager.cpp gus_module_manager.h)
+														
+SOURCE_GROUP("GUS Core" FILES	gus_chat.cpp 
+								gus_chat.h 
+								gus_client_manager.cpp 
+								gus_client_manager.h 
+								gus_mirror.cpp 
+								gus_mirror.h 
+								gus_text.cpp 
+								gus_text.h 
+								gus_utils.cpp 
+								gus_utils.h 
+								gus_util_commands.cpp)
+
+ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 
@@ -26,7 +137,7 @@ TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
 						${ZLIB_LIBRARIES} 
 						nelmisc
 						nelnet 
-						nelgeorges} 
+						nelgeorges
 						nelligo)
 
 NL_DEFAULT_PROPS(ryzom_general_utilities_service "Ryzom, Services: General Utilities Service (GUS)")
diff --git a/code/ryzom/server/src/general_utilities_service/em_commands.cpp b/code/ryzom/server/src/general_utilities_service/em_commands.cpp
index 7437f4865..1411e515e 100644
--- a/code/ryzom/server/src/general_utilities_service/em_commands.cpp
+++ b/code/ryzom/server/src/general_utilities_service/em_commands.cpp
@@ -312,7 +312,8 @@ NLMISC_CATEGORISED_COMMAND(EventManager,emUpdateTools,"update tools installed on
 // Extra commands that open MFC windows
 //-----------------------------------------------------------------------------
 
-#ifdef _WINDOWS
+//#ifdef _WINDOWS
+#if 0
 
 #include "mfc/stdafx.h"
 #include "nel/misc/win_displayer.h"
diff --git a/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp b/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
index 3958b360f..f000dc2e7 100644
--- a/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
+++ b/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
@@ -358,7 +358,7 @@ void CEventManagerImplementation::displayModule() const
 	for (TShards::const_iterator it=_Shards.begin(); it!=_Shards.end(); ++it)
 	{
 		CSString s= (*it).first+ ": ";
-		for (TShardsMapEntry::iterator it2= (*it).second.begin(); it2!=(*it).second.end(); ++it2)
+		for (TShardsMapEntry::const_iterator it2= (*it).second.begin(); it2!=(*it).second.end(); ++it2)
 		{
 			s+= NLMISC::toString((*it2))+" ";
 		}
@@ -478,7 +478,7 @@ void CEventManagerImplementation::startEvent(const NLMISC::CSString& shardName)
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending event start request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
@@ -502,7 +502,7 @@ void CEventManagerImplementation::stopEvent(const NLMISC::CSString& shardName)
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending event stop request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
@@ -569,7 +569,7 @@ void CEventManagerImplementation::peekInstalledEvent(const NLMISC::CSString& sha
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending history request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
diff --git a/code/ryzom/server/src/general_utilities_service/gus_utils.cpp b/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
index db1f2bf5a..183386bc5 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
+++ b/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
@@ -45,74 +45,6 @@ using namespace NLNET;
 
 namespace GUS
 {
-	//-----------------------------------------------------------------------------
-	// cleanPath - convert a path to standardised format
-	//-----------------------------------------------------------------------------
-
-	CSString cleanPath(const CSString& path,bool addTrailingSlash)
-	{
-		CSString result;
-
-		// split the path up into its component elements
-		CVectorSString pathComponents;
-		path.unquoteIfQuoted().splitByOneOfSeparators("/\\",pathComponents,false,false,true,false,true);
-
-		// iterate over path components collapsing '.' and '..' entries
-		for (uint32 i=0;i<pathComponents.size();++i)
-		{
-			// skip "." entries
-			if (pathComponents[i]==".")
-			{
-				pathComponents[i].clear();
-				continue;
-			}
-
-			// deal with ".."
-			if (pathComponents[i]=="..")
-			{
-				// run back through our component list looking for an element to remove
-				uint32 j;
-				for (j=i;j--;)
-				{
-					if (!pathComponents[j].empty())
-						break;
-				}
-				// if we found an element then remove it and the '..' as well
-				if (j!=~0u)
-				{
-					pathComponents[j].clear();
-					pathComponents[i].clear();
-				}
-				continue;
-			}
-		}
-
-		// treat the special case where oriinal path started with a '/' or '//'
-		if (path.left(1)=="/" || path.left(1)=="\\")
-		{
-			result= (path.left(2).right(1)=="/" || path.left(2).right(1)=="\\")? "//": "/";
-		}
-
-		// concatenate the path bits
-		for (uint32 i=0;i<pathComponents.size();++i)
-		{
-			if (!pathComponents[i].empty())
-			{
-				result+= pathComponents[i];
-				result+= '/';
-			}
-		}
-
-		// if we're not supposed to have a trailing slash then get rid of the one that's added by default
-		if (addTrailingSlash==false && path.right(1)!='/' && path.right(1)!='\\')
-		{
-			result.resize(result.size()-1);
-		}
-
-		return result;
-	}
-
-
 	//-----------------------------------------------------------------------------
 	// private routines for layer 5 service tracking
 	//-----------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/general_utilities_service/gus_utils.h b/code/ryzom/server/src/general_utilities_service/gus_utils.h
index b35293454..9935aa5ca 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_utils.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_utils.h
@@ -39,27 +39,6 @@ namespace GUS
 	// handy utilities
 	//-----------------------------------------------------------------------------
 
-	// Clean a path performing the following operations:
-	//	- convert '\\' characters to '/'
-	//	- replace '//' strings in the middle of the path with '/'
-	//	- remove '.' directory entries
-	//	- colapse '..' directory entries (removing parent entries)
-	//	- append a final '/' (optionally)
-	//
-	// examples:
-	//	- a:/bcd/efg/		=>	a:/bcd/efg/ (no change)
-	//	- a:\bcd\efg		=>	a:/bcd/efg/
-	//	- \bcd\\efg			=>	/bcd/efg/
-	//	- \\bcd\efg			=>	//bcd/efg/
-	//	- \bcd\.\efg		=>	/bcd/efg/
-	//	- \bcd\..\efg		=>	/efg/
-	//	- bcd\..\efg		=>	efg/
-	//	- bcd\..\..\efg		=>	../efg/
-	//	- \bcd\..\..\efg	=>	/efg/		(NOTE: the redundant '..' entry is lost due to leading '\')
-	//
-	NLMISC::CSString cleanPath(const NLMISC::CSString& path,bool addTrailingSlash);
-
-
 	// execute a command on a remote service
 	void executeRemoteCommand(NLNET::TServiceId sid,const NLMISC::CSString& cmdLine);
 	void executeRemoteCommand(const char* serviceName,const NLMISC::CSString& cmdLine);
diff --git a/code/ryzom/server/src/general_utilities_service/service_main.cpp b/code/ryzom/server/src/general_utilities_service/service_main.cpp
index 573770fea..90633fa6f 100644
--- a/code/ryzom/server/src/general_utilities_service/service_main.cpp
+++ b/code/ryzom/server/src/general_utilities_service/service_main.cpp
@@ -28,11 +28,15 @@
 #include "game_share/ryzom_version.h"
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"
-#include "game_share/handy_commands.h"
+#include "server_share/handy_commands.h"
 
 // local
 #include "service_main.h"
 
+#ifdef NL_OS_WINDOWS
+#	define NOMINMAX
+#	include <windows.h>
+#endif // NL_OS_WINDOWS
 
 //-----------------------------------------------------------------------------
 // namespaces
diff --git a/code/ryzom/server/src/input_output_service/chat_manager.h b/code/ryzom/server/src/input_output_service/chat_manager.h
index 20704cf2f..8fbc34deb 100644
--- a/code/ryzom/server/src/input_output_service/chat_manager.h
+++ b/code/ryzom/server/src/input_output_service/chat_manager.h
@@ -248,9 +248,9 @@ public :
 	 * \param target is the id of the target char
 	 * \param phraseId is the phrase id (uint32)
 	 */
-	void sendEmoteTextToPlayer(  const TDataSetRow& target,uint32 phraseId )
+	void sendEmoteTextToPlayer(  const TDataSetRow& sender, const TDataSetRow& target, uint32 phraseId )
 	{
-		sendChat2Ex( CChatGroup::say, target, phraseId );
+		sendChat2Ex( CChatGroup::say, target, phraseId, sender );
 	}
 
 	/**
diff --git a/code/ryzom/server/src/input_output_service/input_output_service.cpp b/code/ryzom/server/src/input_output_service/input_output_service.cpp
index 30b7186c3..a0b05a99d 100644
--- a/code/ryzom/server/src/input_output_service/input_output_service.cpp
+++ b/code/ryzom/server/src/input_output_service/input_output_service.cpp
@@ -495,8 +495,8 @@ void CInputOutputService::scanMirrorChanges()
 		if (entityId.getType() == RYZOMID::player)
 		{
 			// init event faction ID in mirror
-			CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, entityIndex, DSPropertyEVENT_FACTION_ID );
-			propEventFactionId = 0;
+			//CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, entityIndex, DSPropertyEVENT_FACTION_ID );
+			//propEventFactionId = 0;
 		}
 
 		entityIndex = DataSet->getNextAddedEntity();
@@ -620,7 +620,7 @@ void CInputOutputService::addCharacterName( const TDataSetRow& chId, const ucstr
 			if( itInfos == _NameToInfos.end() )
 			{
 				// New name does not exist
-				charInfos->ShortName = ucstring(name);
+				charInfos->ShortName.fromUtf8(name);
 			}
 
 			// Save the old name only if new name is not found (and the player is getting original name back)
diff --git a/code/ryzom/server/src/input_output_service/messages.cpp b/code/ryzom/server/src/input_output_service/messages.cpp
index df8eff255..fbece62b8 100644
--- a/code/ryzom/server/src/input_output_service/messages.cpp
+++ b/code/ryzom/server/src/input_output_service/messages.cpp
@@ -709,8 +709,8 @@ static void cbCharacterEventFaction(CMessage& msgin, const string &serviceName,
 		else
 			ci->UntranslatedEventFactionId = SM->storeString( eventFaction );
 
-		CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, chId, DSPropertyEVENT_FACTION_ID );
-		propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
+//		CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, chId, DSPropertyEVENT_FACTION_ID );
+//		propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
 	}
 	else
 	{
@@ -1513,12 +1513,14 @@ void cbEmoteCrowd( CMessage& msgin, const string &serviceName, TServiceId servic
 //-----------------------------------------------
 void cbEmoteSolePlayer( CMessage& msgin, const string &serviceName, TServiceId serviceId )
 {
+	TDataSetRow				sender;
 	TDataSetRow				target;
 	uint32					phraseId;
+	msgin.serial(sender);
 	msgin.serial(target);
 	msgin.serial(phraseId);
 	CChatManager &cm = IOS->getChatManager();
-	cm.sendEmoteTextToPlayer( target,phraseId );
+	cm.sendEmoteTextToPlayer(sender, target, phraseId );
 }
 
 
@@ -1567,6 +1569,10 @@ void cbSetPhrase( CMessage& msgin, const string &serviceName, TServiceId service
 	SM->setPhrase(msgin);
 }
 
+void cbSetPhraseLang( CMessage& msgin, const string& serviceName, TServiceId serviceId )
+{
+	SM->setPhraseLang(msgin);
+}
 
 //-----------------------------------------------
 //	Add a new channel in the dyn chat
@@ -2048,6 +2054,7 @@ TUnifiedCallbackItem CbIOSArray[]=
 	{ "CUSTOM_EMOTE", cbCustomEmote },	// EGS wants IOS to dispatch an emote custom text to all users around
 	
 	{ "SET_PHRASE", cbSetPhrase },			// AIS wants IOS to change a phrase content
+	{ "SET_PHRASE_LANG", cbSetPhraseLang }, // AIS or EGS wants IOS to change a phrase content for a language
 
 	{ "UPDATE_AIALIAS", cbUpdateAIAlias},
 
diff --git a/code/ryzom/server/src/input_output_service/parameter_traits.cpp b/code/ryzom/server/src/input_output_service/parameter_traits.cpp
index 56e9adcd7..6e0749033 100644
--- a/code/ryzom/server/src/input_output_service/parameter_traits.cpp
+++ b/code/ryzom/server/src/input_output_service/parameter_traits.cpp
@@ -231,7 +231,8 @@ public:
 			{
 
 				static const string NAME("name");
-				if (rep.Format != NAME)
+				CSString format = rep.Format;
+				if (format.left(4) != NAME)
 				{
 					// can't replace this parameter, write a del char
 					const static string s("\010");
@@ -270,7 +271,8 @@ public:
 			if (playerInfo != 0)
 			{
 				static const string NAME("name");
-				if (rep.Format != NAME)
+				CSString format = rep.Format;
+				if (format.left(4) != NAME)
 				{
 					// can't replace this parameter, write a del char
 					const static string s("\010");
diff --git a/code/ryzom/server/src/input_output_service/string_manager.cpp b/code/ryzom/server/src/input_output_service/string_manager.cpp
index 6e61f1220..62bdb26c8 100644
--- a/code/ryzom/server/src/input_output_service/string_manager.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager.cpp
@@ -1110,6 +1110,30 @@ void CStringManager::setPhrase(NLNET::CMessage &message)
 	setPhrase(phraseName, phraseContent);
 }
 
+/*
+ * Replace a phrase in specified language (message handler)
+ */
+void CStringManager::setPhraseLang(NLNET::CMessage &message)
+{
+	std::string phraseName;
+	ucstring phraseContent;
+	std::string langString;
+	try
+	{
+		message.serial(phraseName);
+		message.serial(phraseContent);
+		message.serial(langString);
+	}
+	catch( Exception& e )
+	{
+		nlwarning("<setPhrase> %s",e.what());
+		return;
+	}
+
+	TLanguages lang = checkLanguageCode(langString);
+	setPhrase(phraseName, phraseContent, lang);
+}
+
 /*
  * Replace a phrase in default language(s)
  */
diff --git a/code/ryzom/server/src/input_output_service/string_manager.h b/code/ryzom/server/src/input_output_service/string_manager.h
index d860df126..901ac0320 100644
--- a/code/ryzom/server/src/input_output_service/string_manager.h
+++ b/code/ryzom/server/src/input_output_service/string_manager.h
@@ -673,6 +673,7 @@ public:
 	}
 
 	void setPhrase(NLNET::CMessage &message);
+	void setPhraseLang(NLNET::CMessage &message);
 	void setPhrase(std::string const& phraseName, ucstring const& phraseContent);
 	void setPhrase(std::string const& phraseName, ucstring const& phraseContent, TLanguages language);
 	/// Returns the language used in the setPhrase command.
diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
index 57b8758af..8cfbe5d90 100644
--- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
@@ -1799,8 +1799,8 @@ void CStringManager::reloadEventFactions(NLMISC::CLog * log, std::string fileNam
 		{
 			if ( TheDataset.isAccessible(ci->DataSetIndex) )
 			{
-				CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, ci->DataSetIndex, DSPropertyEVENT_FACTION_ID );
-				propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
+//				CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, ci->DataSetIndex, DSPropertyEVENT_FACTION_ID );
+//				propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
 			}
 		}
 	}
diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt
index 0a8cb6045..d043c55ca 100644
--- a/code/ryzom/server/src/server_share/CMakeLists.txt
+++ b/code/ryzom/server/src/server_share/CMakeLists.txt
@@ -1,6 +1,14 @@
 FILE(GLOB SRC *.cpp *.h)
 
-NL_TARGET_LIB(ryzom_servershare ${SRC})
+FILE(GLOB R2 
+	r2_*.h r2_*.cpp)
+
+LIST(REMOVE_ITEM SRC R2)
+
+SOURCE_GROUP("" FILES ${SRC})
+SOURCE_GROUP("R2" FILES ${R2})
+
+NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.h b/code/ryzom/server/src/server_share/entity_locator_itf.h
index c5d230ab5..59459a82d 100644
--- a/code/ryzom/server/src/server_share/entity_locator_itf.h
+++ b/code/ryzom/server/src/server_share/entity_locator_itf.h
@@ -98,7 +98,7 @@ namespace ENTITYLOC
 		{
 
 		}
-		
+
 		void serial(NLMISC::IStream &s)
 		{
 			s.serial(_CharEId);
@@ -137,12 +137,12 @@ namespace ENTITYLOC
 			_Interceptor.init(this, module);
 		}
 
-		// unused interceptors 
+		// unused interceptors
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
 		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
 		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
 		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
-	
+
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
 	private:
@@ -273,8 +273,10 @@ namespace ENTITYLOC
 		uint32	_CharId;
 		// Type of the event : true for a connection, false otherwise
 		bool	_Connection;
-		// The privilege of the character (e.g :GM:)
+		// The privilege of the character (e.g :GM:DEV:)
 		std::string	_Privilege;
+		// Last Connection Date
+		uint32	_lastConnectionDate;
 	public:
 		// The character id of the character
 		uint32 getCharId() const
@@ -300,7 +302,7 @@ namespace ENTITYLOC
 				_Connection = value;
 
 		}
-			// The privilege of the character (e.g :GM:)
+			// The privilege of the character (e.g :GM:DEV:)
 		std::string getPrivilege() const
 		{
 			return _Privilege;
@@ -311,13 +313,26 @@ namespace ENTITYLOC
 
 				_Privilege = value;
 
+		}
+			// Last Connection Date
+		uint32 getlastConnectionDate() const
+		{
+			return _lastConnectionDate;
+		}
+
+		void setlastConnectionDate(uint32 value)
+		{
+
+				_lastConnectionDate = value;
+
 		}
 	
 		bool operator == (const TCharConnectionEvent &other) const
 		{
 			return _CharId == other._CharId
 				&& _Connection == other._Connection
-				&& _Privilege == other._Privilege;
+				&& _Privilege == other._Privilege
+				&& _lastConnectionDate == other._lastConnectionDate;
 		}
 
 
@@ -326,12 +341,13 @@ namespace ENTITYLOC
 		{
 
 		}
-		
+
 		void serial(NLMISC::IStream &s)
 		{
 			s.serial(_CharId);
 			s.serial(_Connection);
 			s.serial(_Privilege);
+			s.serial(_lastConnectionDate);
 
 		}
 		
@@ -366,12 +382,12 @@ namespace ENTITYLOC
 			_Interceptor.init(this, module);
 		}
 
-		// unused interceptors 
+		// unused interceptors
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
 		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
 		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
 		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
-	
+
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
 	private:
@@ -454,7 +470,7 @@ namespace ENTITYLOC
 		static void broadcast_connectionEvents(ProxyIterator first, ProxyIterator last, NLNET::IModule *sender, const std::vector < TCharConnectionEvent > &events)
 		{
 			NLNET::CMessage message;
-			
+
 			// create the message to send to multiple dest
 			buildMessageFor_connectionEvents(message , events);
 
diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.xml b/code/ryzom/server/src/server_share/entity_locator_itf.xml
index 829d4c51e..998c395a8 100644
--- a/code/ryzom/server/src/server_share/entity_locator_itf.xml
+++ b/code/ryzom/server/src/server_share/entity_locator_itf.xml
@@ -70,7 +70,8 @@
 
 			<property type="uint32"			name="CharId"		doc="The character id the the character"/>
 			<property type="bool"			name="Connection"	doc="Type of the event : true for a connection, false otherwise"/>
-			<property type="std::string"	name="Privilege"	doc="The privilege of the character (e.g :GM:)"/>
+			<property type="std::string"	name="Privilege"	doc="The privilege of the character (e.g :GM:DEV:)"/>
+			<property type="uint32"			name="lastConnectionDate"		doc="Last Connection Date"/>
 		</class>
 
 
diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h
index 1f6a23053..c62ca0283 100644
--- a/code/ryzom/server/src/server_share/msg_ai_service.h
+++ b/code/ryzom/server/src/server_share/msg_ai_service.h
@@ -503,6 +503,26 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
 };
 
+//----------------------------------------------------------------------------
+// AIS -> EGS send bot url information
+//----------------------------------------------------------------------------
+class CCreatureSetUrlMsg : public CMirrorTransportClass
+{
+public:
+	std::vector<TDataSetRow>	Entities;
+	std::string		ActionName;
+	std::string		Url;
+	
+	virtual void description ()
+	{
+		className ("CCreatureSetUrlMsg");
+		propertyCont ("Entities", PropDataSetRow, Entities);
+		property ("ActionName", PropString, std::string(), ActionName);
+		property ("Url", PropString, std::string(), Url);
+	}
+	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+};
+
 //----------------------------------------------------------------------------
 // AIS -> EGS send despawn of aiinstance
 //----------------------------------------------------------------------------
@@ -582,6 +602,27 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
 };
 
+//----------------------------------------------------------------------------
+// AIS -> EGS ais change creature Max HP
+//----------------------------------------------------------------------------
+class CChangeCreatureMaxHPMsg : public CMirrorTransportClass
+{
+public:
+	std::vector<TDataSetRow>    Entities;
+	std::vector<uint32>         MaxHp;
+	std::vector<uint8>          SetFull;
+	
+	virtual void description ()
+	{
+		className ("CChangeCreatureMaxHPMsg");
+		propertyCont ("Entities", PropDataSetRow, Entities);
+		propertyCont ("MaxHp", PropUInt32, MaxHp);
+		propertyCont ("SetFull", PropUInt8, SetFull);
+	}
+	
+	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+};
+
 //----------------------------------------------------------------------------
 // AIS -> EGS ais change creature HP
 //----------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/server_share/npc_description_messages.h b/code/ryzom/server/src/server_share/npc_description_messages.h
index fcccd8b11..051cbeb44 100644
--- a/code/ryzom/server/src/server_share/npc_description_messages.h
+++ b/code/ryzom/server/src/server_share/npc_description_messages.h
@@ -47,7 +47,7 @@ std::string buildChatDebugString(const std::vector<uint32> &ShopCategories,
 class CNpcChatProfile
 {
 public:
-	CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _FilterExplicitActionTradeByPlayerRace(false), 
+	CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _Organization(0), _FilterExplicitActionTradeByPlayerRace(false), 
 		_ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true){}
 	CNpcChatProfile(const CNpcChatProfile &other0,const CNpcChatProfile &other1);
 	virtual ~CNpcChatProfile() {}
@@ -84,6 +84,7 @@ public:
 	const std::string					&getWebPageName() const		{ return _WebPageName; }
 
 	const NLMISC::CSheetId				&getOutpost() const			{ return _Outpost; }
+	const uint32						getOrganization() const			{ return _Organization; }
 	
 protected:
 	std::vector< RYMSG::TExplicitSale >	_ExplicitSales;
@@ -125,6 +126,8 @@ protected:
 	std::vector<std::string>		_OptionalProperties;
 	
 	NLMISC::CSheetId				_Outpost;
+
+	uint32							_Organization;
 };
 
 //----------------------------------------------------------------
diff --git a/code/ryzom/server/src/server_share/pet_interface_msg.h b/code/ryzom/server/src/server_share/pet_interface_msg.h
index c7bce60b7..09bbab13d 100644
--- a/code/ryzom/server/src/server_share/pet_interface_msg.h
+++ b/code/ryzom/server/src/server_share/pet_interface_msg.h
@@ -42,6 +42,7 @@ public:
 	uint16				PetIdx;	// must be returned to EGS with CPetSpawnConfirmationMsg class
 	sint32				Coordinate_X, Coordinate_Y, Coordinate_H; //For NEAR_POINT mode
 	float				Heading; //For NEAR_POINT mode
+	ucstring			CustomName;
 
 	virtual void description ()
 	{
@@ -55,6 +56,7 @@ public:
 		property ("Coordinate_Y", PropSInt32, (sint32)0, Coordinate_Y);
 		property ("Coordinate_H", PropSInt32, (sint32)0, Coordinate_H);
 		property ("Heading", PropFloat, 0.0f, Heading);
+		property ("CustomName", PropUCString, ucstring(""), CustomName);
 	}
 
 	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
diff --git a/code/ryzom/server/src/server_share/pvp_relation.h b/code/ryzom/server/src/server_share/pvp_relation.h
index b5219555b..6a3a09b21 100644
--- a/code/ryzom/server/src/server_share/pvp_relation.h
+++ b/code/ryzom/server/src/server_share/pvp_relation.h
@@ -23,10 +23,10 @@ namespace PVP_RELATION
 {
 	enum TPVPRelation
 	{
-		Neutral,
-		NeutralPVP,
-		Ally,
-		Ennemy,
+		Neutral, // Only Heal, no propagation
+		NeutralPVP, // No Heal, No attack
+		Ally, // Only heal, propagation
+		Ennemy, // Only attack, propagation
 		Unknown
 	};
 
diff --git a/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp b/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
index 06c9ff36e..9b56812a6 100644
--- a/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
@@ -582,6 +582,8 @@ namespace ENTITYLOC
 
 		void _charConnected(NLNET::IModuleProxy *sender, uint32 charId, uint32 lastDisconnectionDate, uint32 shardId)
 		{
+			uint32 lastConnectionDate = CTime::getSecondsSince1970();
+
 			TCharMap::iterator it(_ConnectedChars.find(charId));
 			if (it != _ConnectedChars.end())
 			{
@@ -605,7 +607,7 @@ namespace ENTITYLOC
 					ci.CharName = toLower(fullName);
 
 					// update the last played date
-					character->setLastPlayedDate(CTime::getSecondsSince1970());
+					character->setLastPlayedDate(lastConnectionDate);
 					character->update(_RingDB);
 				}
 
@@ -634,6 +636,7 @@ namespace ENTITYLOC
 			cce.setCharId(charId);
 			cce.setConnection(true);
 			cce.setPrivilege(privilege);
+			cce.setlastConnectionDate(lastConnectionDate);
 			connections.push_back(cce);
 
 			CEntityLocatorClientProxy::broadcast_connectionEvents(_ClientTracker.getTrackedModules().begin(), _ClientTracker.getTrackedModules().end(),
@@ -658,7 +661,7 @@ namespace ENTITYLOC
 			if (character !=NULL)
 			{
 				// update the last played date
-				character->setLastPlayedDate(CTime::getSecondsSince1970());
+				character->setLastPlayedDate(0);
 				character->update(_RingDB);
 			}