Major merge from 'dev'

- BronsonAVLTreeMap (testing not complete yet, memory leaks is possible)
- Refactoring

diff --combined build/build.sh
index dedc7ab06948e717f1afe96f1b3a150962a09de4,01c8ada35e19e5c7e6c5d14b9e80b156d6c8c74a..5d5b249acdaa5092dfb1955a58232b8e2aa34d77
mode 100644,100755..100644
--- 1/build/build.sh
--- 2/build/build.sh
+++ b/build/build.sh
@@@ -453,7 -453,7 +453,7 @@@ cxx_debug_options="-D_DEBUG -O0 -g $cxx
  cxx_release_options="-DNDEBUG $cxx_release_optimization $cxx_release_options"
  
  
 -if test '$BOOST_INCLUDE_PATH' != ''; then
 +if test 'x$BOOST_INCLUDE_PATH' != 'x'; then
        buildCXXflags="$buildCXXflags -I$BOOST_INCLUDE_PATH"
  fi
  
@@@ -534,11 -534,8 +534,8 @@@ $MAKE -f Makefile 
       platform=$OS_FAMILY \
       BIN_PATH=$BIN_PATH \
       OBJ_PATH=$OBJ_PATH/debug \
-      debug
- 
- if test $? -gt 0; then
-    exit $?
- fi
+      debug \
+   || exit $?
  
  echo ---------------------------------
  echo Make release library
@@@ -560,11 -557,8 +557,8 @@@ $MAKE -f Makefile 
       platform=$OS_FAMILY \
       BIN_PATH=$BIN_PATH \
       OBJ_PATH=$OBJ_PATH/release \
-      release
-      
- if test $? -gt 0; then
-    exit $?
- fi
+      release \
+   || exit $?
  
  
  echo ---------------------------------
@@@ -582,11 -576,8 +576,8 @@@ if test $MAKE_DEBUG_TEST = '0'; the
          platform=$OS_FAMILY \
          BIN_PATH=$BIN_PATH \
          OBJ_PATH=$OBJ_PATH/test \
-         $target
-         
-     if test $? -gt 0; then
-         exit $?
-     fi
+         $target \
+      || exit $?
  fi    
  
  echo ---------------------------------
@@@ -604,10 -595,7 +595,7 @@@ if test $MAKE_DEBUG_TEST = '1'; the
          platform=$OS_FAMILY \
          BIN_PATH=$BIN_PATH \
          OBJ_PATH=$OBJ_PATH/test-debug \
-         $target
-         
-     if test $? -gt 0; then
-         exit $?
-     fi
+         $target \
+      || exit $?
  fi   
 - 
 +