asdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/.settings/org.eclipse.core.resources.prefs
	HelloWorld/WebContent/NewRule.jsp
	HelloWorld/WebContent/OrderList.jsp
	HelloWorld/src/com/dicks/action/CreateNewBizRule.java
	HelloWorld/src/com/dicks/dao/ProdCateDAO.java
	HelloWorld/src/com/dicks/engine/CreateTemplate.java