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

Conflicts:
	HelloWorld/src/struts.xml


Signed-off-by: claire921 <claire921@gmail.com>
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/struts.xml
Merge branch 'master' of https://github.com/claire921/dicks.git
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/struts.xml
Link place order to order visualization
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/WebContent/VisualizationOrderDetail.jsp
fixing place order

Signed-off-by: claire921 <claire921@gmail.com>