micky
Merge branch 'master' of https://github.com/alexfz420/DSG

Conflicts:
	DSG/src/com/dicks/pojo/Rule.java
micky
Merge branch 'master' of https://github.com/alexfz420/DSG

Conflicts:
	DSG/src/com/dicks/action/CostCalculationAction.java
	DSG/src/com/dicks/rules/newRule_joe.drl
	DSG/src/struts.xml