add new code
add new code
add new code
add new code
add new code
add new code
Merge branch 'dev' of github.com:singerinsky/faq_server into dev

Conflicts:
	build/CMakeFiles/Makefile2
	build/CMakeFiles/progress.marks
	build/common/CMakeFiles/common.dir/CXX.includecache
	build/common/CMakeFiles/common.dir/build.make
	build/common/CMakeFiles/common.dir/cmake_clean.cmake
	build/common/CMakeFiles/common.dir/link.txt
	build/db_server/CMakeFiles/db_server.dir/CXX.includecache
	build/db_server/CMakeFiles/db_server.dir/build.make
	build/db_server/CMakeFiles/db_server.dir/cmake_clean.cmake
	build/db_server/CMakeFiles/db_server.dir/depend.internal
	build/db_server/CMakeFiles/db_server.dir/link.txt
	build/gate_server/CMakeFiles/gate_server.dir/build.make
	build/gate_server/CMakeFiles/gate_server.dir/cmake_clean.cmake
	build/gate_server/CMakeFiles/gate_server.dir/link.txt
	build/gate_server/CMakeFiles/gate_server.dir/progress.make
	build/gate_server/CMakeFiles/progress.marks
	build/message/CMakeFiles/message_lib.dir/build.make
	build/message/CMakeFiles/message_lib.dir/cmake_clean.cmake
	build/message/CMakeFiles/message_lib.dir/link.txt
	build/message/CMakeFiles/message_lib.dir/progress.make
	db_server/action_data_work_message.cpp
	game_exe/core
	game_exe/db_server
	game_exe/gate_server