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

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

Conflicts:
	HelloWorld/WebContent/TemplateCostCalculationjsp.jsp
	HelloWorld/src/com/dicks/action/CreateNewBizRule.java
	HelloWorld/src/struts.xml