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

Conflicts:
	DSG/src/struts.xml
Merge branch 'master' of https://github.com/alexfz420/DSG

Conflicts:
	DSG/WebContent/RuleList.jsp
	DSG/src/com/dicks/engine/WriteDrl.java
	DSG/src/com/dicks/pojo/Rule.java
	DSG/src/struts.xml