Signed-off-by: edhuacao <edhuacao@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/.settings/org.eclipse.core.resources.prefs
	HelloWorld/WebContent/OrderList.jsp
	HelloWorld/WebContent/css/common.css
	HelloWorld/src/com/dicks/action/Redirect.java
	HelloWorld/src/struts.xml