merge with latest code

Author: Peng Li

paddle/gserver/tests/CMakeLists.txt

@@ -21,8 +21,7 @@ add_test(NAME test_LayerGrad
 ################ test_CRFLayerGrad ####################
 add_unittest_without_exec(test_CRFLayerGrad
     test_CRFLayerGrad.cpp
-    LayerGradUtil.cpp
-    TestUtil.cpp)
+    LayerGradUtil.cpp)
 add_test(NAME test_CRFLayerGrad
     COMMAND test_CRFLayerGrad)
 

paddle/gserver/tests/test_CRFLayerGrad.cpp

@@ -19,7 +19,7 @@ limitations under the License. */
 #include "paddle/trainer/Trainer.h"
 
 #include "LayerGradUtil.h"
-#include "TestUtil.h"
+#include "paddle/testing/TestUtil.h"
 
 using namespace paddle;  // NOLINT