solve log luan ma
Merge remote-tracking branch 'origin/tbdev' into tbdev2

Conflicts:
	trunk/src/app/srs_app_tb_log.cpp
	trunk/src/app/srs_app_tb_log.hpp
solve conflicts
Merge remote-tracking branch 'origin/tbdev2' into tbdev