1

Signed-off-by: wanghuiwhwx <wanghui_whwx@sina.com>
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	WebContent/asIndexTemp.jsp