rulelist done
dg
fsd
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/WebContent/RuleList.jsp
	HelloWorld/src/struts.xml