Merge remote-tracking branch 'weiyue/master' into jst

Conflicts:
	auto/options
Merge remote-tracking branch 'qingtan/session_sticky' into jst

Conflicts:
	auto/modules
	auto/options
Merge remote-tracking branch 'weiyue/master' into jst

Conflicts:
	auto/options
Merge remote-tracking branch 'qingtan/session_sticky' into jst

Conflicts:
	auto/modules
	auto/options
Merge remote-tracking branch 'qingtan/session_sticky' into jst

Conflicts:
	auto/options
Merge remote-tracking branch 'qingtan/session_sticky' into jst
Merge remote-tracking branch 'weiyue/master' into jst
Merge remote-tracking branch 'weiyue/master' into jst
Merge remote-tracking branch 'qingtan/session_sticky' into jst
Merge remote-tracking branch 'qingtan/session_sticky' into jst
Merge remote-tracking branch 'qingtan/session_sticky' into jst
Merge remote-tracking branch 'qingtan/session_sticky' into jst
Merge branch 'traffic_status_stable' into jst
fixed dso_tool install error with rpm
Added channel extension to proc module
Merge pull request #98 from yzprofile/jst

Added channel extension to proc module
Merge branch 'develop' into jst

Conflicts:
	auto/install
	src/http/ngx_http_request_body.c
Merge remote-tracking branch 'weiyue/statistics' into jst
add TFS (Taobao FileSystem) module.
Merge pull request #170 from monadbobo/tfs2

add TFS (Taobao FileSystem) module.