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

Conflicts:
	DSG/smallTest.log
asdf
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/WebContent/PrioritizeRule.jsp
	DSG/WebContent/VisualizationOrderDetail.jsp
	DSG/smallTest.log
	DSG/src/com/dicks/dao/StoreDAO.java
	DSG/src/com/dicks/pojo/Rule.hbm.xml