modified:   thirdparty/nginx-1.4.4/logs/access.log
	modified:   thirdparty/nginx-1.4.4/logs/error.log
	modified:   thirdparty/nginx-1.4.4/logs/nginx.pid
Merge branch 'master' of https://github.com/caszhang/BackgroudDevelopmentEnvionment

Conflicts:
	thirdparty/nginx-1.4.4/logs/access.log
	thirdparty/nginx-1.4.4/logs/error.log
	thirdparty/nginx-1.4.4/logs/nginx.pid