2
Merge branch 'fortest'

Conflicts:
	Demand/WebContent/alive.jsp