wtm 11 commit at aftre body in index jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	DEMO/WebContent/index.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	DEMO/WebContent/index.jsp