merge
Merge branch 'master' of github.com:yuyunliuhen/server_framework

Conflicts:
	login/login_packet_handle.cc

	modified:   common/msg.h
	modified:   login/login.cc
	modified:   login/login.h
	modified:   login/login_packet_handle.cc
	modified:   login/login_packet_handle.h
	modified:   proto/login.proto
	modified:   test_client/client.cc
	modified:   test_client/client.h
	modified:   test_client/client_packet_handle.cc
	modified:   test_client/client_packet_handle.h
	modified:   test_client/test_client.cc