Merge branch 'master' of https://github.com/jimzshi/fw.git

Conflicts:
	simfcgi/CMakeLists.txt
	simfcgi/simfcgi-mt.cpp
	simfcgi/simfcgi.ini