fasdfasf!!!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelloWorld/WebContent/TemplateSpecialRoute.jsp
	HelloWorld/bin/com/dicks/rules/newRule_joe.drl
	HelloWorld/src/Test/HibernateTest.java
	HelloWorld/src/com/dicks/action/RuleList.java
	HelloWorld/src/com/dicks/action/RulePriority.java
	HelloWorld/src/com/dicks/rules/newRule_joe.drl
	HelloWorld/src/struts.xml