micky
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/WebContent/OrderList.jsp
	HelloWorld/src/struts.xml
micky