epoll server with two template parames
Merge branch 'master' of https://github.com/sails/sails

Conflicts:
	log/logging.cc
	net/epoll_server.h