Merge branch 'master' of https://github.com/claire921/dicks.git
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/src/Test/HibernateTest.java
	HelloWorld/src/com/dicks/action/RulePriority.java
micky
Merge branch 'master' of https://github.com/claire921/dicks.git

Conflicts:
	HelloWorld/WebContent/rulePriority.jsp
	HelloWorld/src/struts.xml
Merge remote-tracking branch 'origin/master'