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

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

Conflicts:
	HelloWorld/src/com/dicks/action/RulePriority.java


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

Conflicts:
	HelloWorld/WebContent/Edit_TemplateCostCalculation.jsp