wtm 08 before merge index jsp fule
Merge remote-tracking branch 'origin/master'

Conflicts:
	DEMO/WebContent/index.jsp