2014/06/06
Merge branch 'develop' of https://github.com/timyangjian/asyn_server into develop

Conflicts:
	epoll_mgr.cpp
	main.cpp
	shmq_mgr.cpp
	shmq_mgr.h
2014/06/10