change back to green
Merge branch 'master' into fortest

Conflicts:
	Demand/WebContent/alive.jsp